Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

Changed files
+2988 -748
lib
nixos
modules
services
continuous-integration
jenkins
monitoring
x11
desktop-managers
system
pkgs
applications
altcoins
audio
mopidy
spotify
misc
networking
corebird
instant-messengers
torchat
ostinato
office
data
fonts
cantarell-fonts
icons
deepin-icon-theme
papirus-icon-theme
misc
hackage
desktops
gnome-2
desktop
gnome-session
development
haskell-modules
interpreters
elixir
jruby
php
libraries
glib-networking
gstreamer
hunspell
libbap
libbson
libebur128
libgphoto2
mlt
msilbc
opendht
range-v3
rdkafka
misc
avr
binutils
ocaml-modules
python-modules
bap
pymetar
tools
ammonite
documentation
mkdocs
flyway
misc
msitools
ocaml
jbuilder
games
openspades
xmoto
misc
emulators
retroarch
os-specific
darwin
servers
mail
mlmmj
monitoring
grafana
riemann
nosql
neo4j
sql
mysql
web-apps
searx
tools
top-level
+3
lib/maintainers.nix
···
dzabraev = "Maksim Dzabraev <dzabraew@gmail.com>";
e-user = "Alexander Kahl <nixos@sodosopa.io>";
earldouglas = "James Earl Douglas <james@earldouglas.com>";
+
earvstedt = "Erik Arvstedt <erik.arvstedt@gmail.com>";
ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>";
edanaher = "Evan Danaher <nixos@edanaher.net>";
edef = "edef <edef@edef.eu>";
···
erictapen = "Justin Humm <justin.humm@posteo.de>";
erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
ertes = "Ertugrul Söylemez <esz@posteo.de>";
+
erosennin = "Andrey Golovizin <ag@sologoc.com>";
ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>";
etu = "Elis Hirwing <elis@hirwing.se>";
exfalso = "Andras Slemmer <0slemi0@gmail.com>";
···
tilpner = "Till Höppner <till@hoeppner.ws>";
timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
timokau = "Timo Kaufmann <timokau@zoho.com>";
+
timor = "timor <timor.dd@googlemail.com>";
tiramiseb = "Sébastien Maccagnoni <sebastien@maccagnoni.eu>";
titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
tnias = "Philipp Bartsch <phil@grmr.de>";
+1 -1
nixos/modules/services/continuous-integration/jenkins/default.nix
···
'';
postStart = ''
-
until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
+
until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
sleep 1
done
'';
+1 -1
nixos/modules/services/monitoring/grafana.nix
···
};
preStart = ''
ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir}
-
ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir}
+
ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir}
'';
};
+1 -1
nixos/modules/services/x11/desktop-managers/gnome3.nix
···
# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
-
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
+
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
services.xserver.desktopManager.session = singleton
{ name = "gnome3";
+1 -1
nixos/modules/system/boot/initrd-ssh.nix
···
echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
'') cfg.authorizedKeys)}
-
dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
+
dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
'';
boot.initrd.secrets =
+4 -3
pkgs/applications/altcoins/bitcoin.nix
···
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-
version = "0.15.1";
+
version = "0.16.0";
src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
-
sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil";
+
sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
···
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
-
platforms = platforms.unix;
+
# bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment.
+
platforms = platforms.linux;
};
}
+3 -3
pkgs/applications/altcoins/default.nix
···
-
{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
+
{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
rec {
aeon = callPackage ./aeon { };
-
bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; };
-
bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; };
+
bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
+
bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
+4 -4
pkgs/applications/altcoins/ethabi.nix
···
buildRustPackage rec {
name = "ethabi-${version}";
-
version = "1.0.4";
+
version = "4.1.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "ethabi";
-
rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f";
-
sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
+
rev = "v${version}";
+
sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p";
};
-
cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy";
+
cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz";
cargoBuildFlags = ["--features cli"];
+2 -2
pkgs/applications/altcoins/seth.nix
···
stdenv.mkDerivation rec {
name = "seth-${version}";
-
version = "0.6.2";
+
version = "0.6.3";
src = fetchFromGitHub {
owner = "dapphub";
repo = "seth";
rev = "v${version}";
-
sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4";
+
sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk";
};
nativeBuildInputs = [makeWrapper];
+2 -2
pkgs/applications/audio/mopidy/default.nix
···
];
propagatedBuildInputs = with pythonPackages; [
-
gst-python pygobject3 pykka tornado requests dbus-python
-
];
+
gst-python pygobject3 pykka tornado requests
+
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
doCheck = false;
+2 -2
pkgs/applications/audio/spotify/default.nix
···
# 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.70.399.g5ffabd56-26";
+
version = "1.0.69.336.g7edcc575-39";
deps = [
alsaLib
···
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-
sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29";
+
sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
};
buildInputs = [ dpkg makeWrapper ];
+2 -2
pkgs/applications/misc/blender/default.nix
···
with lib;
stdenv.mkDerivation rec {
-
name = "blender-2.79";
+
name = "blender-2.79a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
-
sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9";
+
sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc";
};
buildInputs =
+2 -2
pkgs/applications/misc/gphoto2/default.nix
···
}:
stdenv.mkDerivation rec {
-
name = "gphoto2-2.5.11";
+
name = "gphoto2-2.5.15";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-
sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
+
sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf";
};
nativeBuildInputs = [ pkgconfig gettext libtool ];
+2 -2
pkgs/applications/misc/josm/default.nix
···
stdenv.mkDerivation rec {
name = "josm-${version}";
-
version = "13367";
+
version = "13478";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-
sha256 = "1yf7cx8159njxid9qa0id7zfkr7dn83rrkgxp9kzkjn25aqji4cf";
+
sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4";
};
buildInputs = [ jre8 makeWrapper ];
+2 -2
pkgs/applications/misc/nnn/default.nix
···
stdenv.mkDerivation rec {
name = "nnn-${version}";
-
version = "1.6";
+
version = "1.7";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
-
sha256 = "1yl4k39wkh2ins7fz585kc4cg6fagiswgqkh5g36db1bka3v1kn0";
+
sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89";
};
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
+58
pkgs/applications/misc/opentx/default.nix
···
+
{ stdenv, fetchFromGitHub
+
, cmake, gcc-arm-embedded, python
+
, qt5, SDL, gmock
+
, dfu-util, avrdude
+
}:
+
+
let
+
+
version = "2.2.1";
+
+
in stdenv.mkDerivation {
+
+
name = "opentx-${version}";
+
+
src = fetchFromGitHub {
+
owner = "opentx";
+
repo = "opentx";
+
rev = version;
+
sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g";
+
};
+
+
enableParallelBuilding = true;
+
+
nativeBuildInputs = [ cmake ];
+
+
buildInputs = with qt5; [
+
gcc-arm-embedded
+
python python.pkgs.pyqt4
+
qtbase qtmultimedia qttranslations
+
SDL gmock
+
];
+
+
postPatch = ''
+
sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|'
+
sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+
'';
+
+
cmakeFlags = [
+
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
+
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
+
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
+
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
+
];
+
+
meta = with stdenv.lib; {
+
description = "OpenTX Companion transmitter support software";
+
longDescription = ''
+
OpenTX Companion is used for many different tasks like loading OpenTX
+
firmware to the radio, backing up model settings, editing settings and
+
running radio simulators.
+
'';
+
homepage = https://open-tx.org/;
+
license = stdenv.lib.licenses.gpl2;
+
platforms = [ "i686-linux" "x86_64-linux" ];
+
maintainers = with maintainers; [ elitak ];
+
};
+
+
}
+15
pkgs/applications/misc/xpdf/cmake_version.patch
···
+
+
Fix "No known features for CXX compiler", see
+
https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at
+
https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
+
--- a/CMakeLists.txt
+
+++ b/CMakeLists.txt
+
@@ -8,7 +8,7 @@
+
#
+
#========================================================================
+
+
-cmake_minimum_required(VERSION 2.8.8)
+
+cmake_minimum_required(VERSION 3.1.0)
+
+
project(xpdf)
+
+13 -3
pkgs/applications/misc/xpdf/default.nix
···
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
-
, cmake, qtbase ? null
+
, cmake, qtbase ? null, qtsvg ? null, makeWrapper
}:
-
assert enableGUI -> qtbase != null && freetype != null;
+
assert enableGUI -> qtbase != null && qtsvg != null && freetype != null;
assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
···
sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
};
-
nativeBuildInputs = [ cmake ];
+
# Fix "No known features for CXX compiler", see
+
# https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at
+
# https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html
+
patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch;
+
+
nativeBuildInputs = [ cmake makeWrapper ];
cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
···
CXXFLAGS = "-O2 -fpermissive";
hardeningDisable = [ "format" ];
+
+
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+
wrapProgram $out/bin/xpdf \
+
--set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
+
'';
meta = {
homepage = http://www.foolabs.com/xpdf/;
+2 -2
pkgs/applications/networking/corebird/default.nix
···
, glib-networking }:
stdenv.mkDerivation rec {
-
version = "1.7.3";
+
version = "1.7.4";
name = "corebird-${version}";
src = fetchFromGitHub {
owner = "baedert";
repo = "corebird";
rev = version;
-
sha256 = "1xay22v5j239ppl6ydbj842zpm5v2mg5mcgpy5cjrhhmnbg79fgk";
+
sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
};
preConfigure = ''
-1
pkgs/applications/networking/instant-messengers/torchat/default.nix
···
license = licenses.gpl3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
-
broken = true;
};
}
+2 -2
pkgs/applications/networking/ostinato/default.nix
···
stdenv.mkDerivation rec {
name = "ostinato-${version}";
-
version = "0.8";
+
version = "0.9";
src = fetchFromGitHub {
owner = "pstavirs";
repo = "ostinato";
rev = "v${version}";
-
sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3";
+
sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx";
};
ostinatoIcon = fetchurl {
+6 -6
pkgs/applications/office/libreoffice/default-primary-src.nix
···
{ fetchurl }:
rec {
-
major = "5";
-
minor = "4";
-
patch = "1";
-
tweak = "2";
+
major = "6";
+
minor = "0";
+
patch = "2";
+
tweak = "1";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
src = fetchurl {
-
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-
sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k";
+
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+
sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd";
};
}
+23 -15
pkgs/applications/office/libreoffice/default.nix
···
-
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
+
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis
-
, openssl, gperf, cppunit, GConf, ORBit2, poppler
+
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
···
langsSpaces = lib.concatStringsSep " " langs;
fetchSrc = {name, sha256}: fetchurl {
-
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
};
srcs = {
third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
-
url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
+
url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
name = "unowinreg.dll";
}) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix));
translations = fetchSrc {
name = "translations";
-
sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg";
+
sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
-
sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f";
+
sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a";
};
};
···
# BLFS patch for Glibc 2.23 renaming isnan
sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
+
+
# This is required as some cppunittests require fontconfig configured
+
cp "${fontsConf}" fonts.conf
+
sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf
+
export FONTCONFIG_FILE="$PWD/fonts.conf"
'';
# fetch_Download_item tries to interpret the name as a variable name
···
sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
# unit test sd_tiledrendering seems to be fragile
-
# http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+
# https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
echo > ./sd/CppunitTest_sd_tiledrendering.mk
sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
# one more fragile test?
sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+
# this I actually hate, this should be a data consistency test!
+
sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
# rendering-dependent test
sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
# tilde expansion in path processing checks the existence of $HOME
···
sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+
sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+
sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
# not sure about this fragile test
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
'';
···
enableParallelBuilding = true;
buildPhase = ''
-
# This is required as some cppunittests require fontconfig configured
-
export FONTCONFIG_FILE=${fontsConf}
-
# This to avoid using /lib:/usr/lib at linking
sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
···
"--without-system-liblangtag"
"--without-system-libmspub"
"--without-system-libpagemaker"
-
"--without-system-libgltf"
"--without-system-libstaroffice"
+
"--without-system-libepubgen"
+
"--without-system-libqxp"
+
"--without-system-mdds"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
];
···
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw libzmf libtool
-
libxshmfence libatomic_ops graphite2 harfbuzz gpgme
+
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy
-
libodfgen CoinMP librdf_rasqal defaultIconTheme
+
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
gdb
]
++ lib.optional kdeIntegration kdelibs4;
···
meta = with lib; {
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
-
homepage = http://libreoffice.org/;
+
homepage = https://libreoffice.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ viric raskin ];
platforms = platforms.linux;
+271 -229
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
···
[
{
-
name = "libabw-0.1.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2";
-
sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199";
+
name = "libabw-0.1.2.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
+
sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
md5 = "";
-
md5name = "-libabw-0.1.1.tar.bz2";
+
md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
}
{
name = "commons-logging-1.2-src.tar.gz";
url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz";
sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81";
md5 = "";
-
md5name = "-commons-logging-1.2-src.tar.gz";
+
md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz";
}
{
name = "apr-1.5.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
md5 = "";
-
md5name = "-apr-1.5.2.tar.gz";
+
md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz";
}
{
name = "apr-util-1.5.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
md5 = "";
-
md5name = "-apr-util-1.5.4.tar.gz";
+
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
-
name = "boost_1_63_0.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2";
-
sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+
name = "boost_1_65_1.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
+
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
md5 = "";
-
md5name = "-boost_1_63_0.tar.bz2";
+
md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
}
{
name = "breakpad.zip";
url = "http://dev-www.libreoffice.org/src/breakpad.zip";
sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
md5 = "";
-
md5name = "-breakpad.zip";
+
md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip";
}
{
name = "bsh-2.0b6-src.zip";
···
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
-
name = "cairo-1.14.8.tar.xz";
-
url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz";
-
sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20";
+
name = "cairo-1.14.10.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz";
+
sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09";
md5 = "";
-
md5name = "-cairo-1.14.8.tar.xz";
+
md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz";
}
{
-
name = "libcdr-0.1.3.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
-
sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
+
name = "libcdr-0.1.4.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";
+
sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d";
md5 = "";
-
md5name = "-libcdr-0.1.3.tar.bz2";
+
md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
···
url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";
sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e";
md5 = "";
-
md5name = "-libcmis-0.5.1.tar.gz";
+
md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz";
}
{
name = "CoinMP-1.7.6.tgz";
url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f";
md5 = "";
-
md5name = "-CoinMP-1.7.6.tgz";
-
}
-
{
-
name = "collada2gltf-master-cb1d97788a.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
-
sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb";
-
md5 = "4b87018f7fff1d054939d19920b751a0";
-
md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
+
md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
}
{
name = "cppunit-1.14.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";
sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780";
md5 = "";
-
md5name = "-cppunit-1.14.0.tar.gz";
+
md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz";
}
{
name = "converttexttonumber-1-5-0.oxt";
···
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
-
name = "curl-7.52.1.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
-
sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+
name = "curl-7.58.0.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz";
+
sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115";
md5 = "";
-
md5name = "-curl-7.52.1.tar.gz";
+
md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz";
}
{
-
name = "libe-book-0.1.2.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2";
-
sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850";
+
name = "libe-book-0.1.3.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
+
sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9";
md5 = "";
-
md5name = "-libe-book-0.1.2.tar.bz2";
+
md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
name = "libepoxy-1.3.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2";
sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64";
md5 = "";
-
md5name = "-libepoxy-1.3.1.tar.bz2";
+
md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2";
}
{
name = "epm-3.7.tar.gz";
···
md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
}
{
-
name = "libetonyek-0.1.6.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2";
-
sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78";
+
name = "libepubgen-0.1.0.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
+
sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
+
md5 = "";
+
md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
+
}
+
{
+
name = "libetonyek-0.1.7.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
+
sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
md5 = "";
-
md5name = "-libetonyek-0.1.6.tar.bz2";
+
md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
}
{
-
name = "expat-2.2.3.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
-
sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
+
name = "expat-2.2.5.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
+
sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
md5 = "";
-
md5name = "-expat-2.2.3.tar.bz2";
+
md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";
sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860";
md5 = "";
-
md5name = "-Firebird-3.0.0.32483-0.tar.bz2";
+
md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
}
{
-
name = "fontconfig-2.12.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2";
-
sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3";
+
name = "fontconfig-2.12.6.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2";
+
sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017";
md5 = "";
-
md5name = "-fontconfig-2.12.1.tar.bz2";
+
md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2";
}
{
name = "crosextrafonts-20130214.tar.gz";
···
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
-
name = "open-sans-font-ttf-1.10.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
-
sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8";
-
md5 = "7a15edea7d415ac5150ea403e27401fd";
-
md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
-
}
-
{
-
name = "pt-serif-font-1.0000W.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
-
sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa";
-
md5 = "c3c1a8ba7452950636e871d25020ce0d";
-
md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
-
}
-
{
name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
···
url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
md5 = "";
-
md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz";
+
md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
}
{
-
name = "libfreehand-0.1.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
-
sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877";
+
name = "noto-fonts-20171024.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
+
sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
md5 = "";
-
md5name = "-libfreehand-0.1.1.tar.bz2";
+
md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
+
}
+
{
+
name = "culmus-0.131.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
+
sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
+
md5 = "";
+
md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
+
}
+
{
+
name = "libre-hebrew-1.0.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
+
sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a";
+
md5 = "";
+
md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz";
+
}
+
{
+
name = "alef-1.001.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
+
sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52";
+
md5 = "";
+
md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
+
}
+
{
+
name = "amiri-0.109.zip";
+
url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
+
sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+
md5 = "";
+
md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+
}
+
{
+
name = "ttf-kacst_2.01+mry.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
+
sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
+
md5 = "";
+
md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
+
}
+
{
+
name = "ReemKufi-0.6.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
+
sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+
md5 = "";
+
md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+
}
+
{
+
name = "Scheherazade-2.100.zip";
+
url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
+
sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5";
+
md5 = "";
+
md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
+
}
+
{
+
name = "libfreehand-0.1.2.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
+
sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac";
+
md5 = "";
+
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
-
name = "freetype-2.7.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
-
sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
+
name = "freetype-2.8.1.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
+
sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
md5 = "";
-
md5name = "-freetype-2.7.1.tar.bz2";
+
md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
···
md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
}
{
-
name = "gpgme-1.8.0.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2";
-
sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33";
+
name = "gpgme-1.9.0.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
+
sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
md5 = "";
-
md5name = "-gpgme-1.8.0.tar.bz2";
+
md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.10.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz";
sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9";
md5 = "";
-
md5name = "-graphite2-minimal-1.3.10.tgz";
+
md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
}
{
-
name = "harfbuzz-1.3.2.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2";
-
sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027";
+
name = "harfbuzz-1.7.0.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
+
sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
md5 = "";
-
md5name = "-harfbuzz-1.3.2.tar.bz2";
+
md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
···
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
-
name = "hunspell-1.6.0.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
-
sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
-
md5 = "047c3feb121261b76dc16cdb62f54483";
-
md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+
name = "hunspell-1.6.2.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz";
+
sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4";
+
md5 = "";
+
md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
···
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
-
name = "icu4c-58_1-src.tgz";
-
url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
-
sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309";
-
md5 = "1901302aaff1c1633ef81862663d2917";
-
md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
+
name = "icu4c-60_2-src.tgz";
+
url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
+
sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+
md5 = "";
+
md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+
}
+
{
+
name = "icu4c-60_2-data.zip";
+
url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
+
sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+
md5 = "";
+
md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
···
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
-
name = "libjpeg-turbo-1.5.1.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz";
-
sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c";
+
name = "libjpeg-turbo-1.5.2.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz";
+
sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528";
md5 = "";
-
md5name = "-libjpeg-turbo-1.5.1.tar.gz";
+
md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
}
{
-
name = "language-subtag-registry-2017-04-19.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2";
-
sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a";
+
name = "language-subtag-registry-2017-12-14.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
+
sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
md5 = "";
-
md5name = "-language-subtag-registry-2017-04-19.tar.bz2";
+
md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
···
url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz";
sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22";
md5 = "";
-
md5name = "-lcms2-2.8.tar.gz";
+
md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz";
}
{
name = "libassuan-2.4.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";
sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71";
md5 = "";
-
md5name = "-libassuan-2.4.3.tar.bz2";
+
md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2";
}
{
name = "libatomic_ops-7_2d.zip";
url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";
sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad";
md5 = "";
-
md5name = "-libatomic_ops-7_2d.zip";
+
md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip";
}
{
name = "libeot-0.01.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2";
sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a";
md5 = "";
-
md5name = "-libeot-0.01.tar.bz2";
-
}
-
{
-
name = "libexttextcat-3.4.4.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
-
sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163";
-
md5 = "10d61fbaa6a06348823651b1bd7940fe";
-
md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
+
md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
}
{
-
name = "libgltf-0.1.0.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";
-
sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da";
+
name = "libexttextcat-3.4.5.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
+
sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8";
md5 = "";
-
md5name = "-libgltf-0.1.0.tar.gz";
+
md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
}
{
-
name = "libgpg-error-1.26.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2";
-
sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69";
+
name = "libgpg-error-1.27.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
+
sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
md5 = "";
-
md5name = "-libgpg-error-1.26.tar.bz2";
+
md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
}
{
name = "liblangtag-0.6.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";
sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e";
md5 = "";
-
md5name = "-liblangtag-0.6.2.tar.bz2";
+
md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
}
{
name = "ltm-1.0.zip";
url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
md5 = "";
-
md5name = "-ltm-1.0.zip";
+
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
-
name = "xmlsec1-1.2.24.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz";
-
sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc";
+
name = "xmlsec1-1.2.25.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz";
+
sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2";
md5 = "";
-
md5name = "-xmlsec1-1.2.24.tar.gz";
+
md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
}
{
-
name = "libxml2-2.9.4.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
-
sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c";
-
md5 = "ae249165c173b1ff386ee8ad676815f5";
-
md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
+
name = "libxml2-2.9.7.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz";
+
sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c";
+
md5 = "";
+
md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz";
}
{
-
name = "libxslt-1.1.29.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
-
sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce";
-
md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
-
md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
+
name = "libxslt-1.1.32.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz";
+
sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460";
+
md5 = "";
+
md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz";
}
{
name = "lp_solve_5.5.tar.gz";
···
md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
}
{
-
name = "mdds-1.2.2.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
-
sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+
name = "mdds-1.3.1.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2";
+
sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1";
md5 = "";
-
md5name = "-mdds-1.2.2.tar.bz2";
+
md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2";
}
{
name = "mDNSResponder-576.30.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz";
sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0";
md5 = "";
-
md5name = "-mDNSResponder-576.30.4.tar.gz";
+
md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
}
{
-
name = "libmspub-0.1.2.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";
-
sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a";
+
name = "libmspub-0.1.3.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
+
sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
md5 = "";
-
md5name = "-libmspub-0.1.2.tar.bz2";
+
md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
}
{
-
name = "libmwaw-0.3.11.tar.xz";
-
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz";
-
sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a";
+
name = "libmwaw-0.3.13.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
+
sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
md5 = "";
-
md5name = "-libmwaw-0.3.11.tar.xz";
+
md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
···
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
-
name = "neon-0.30.1.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
-
sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd";
-
md5 = "231adebe5c2f78fded3e3df6e958878e";
-
md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
+
name = "neon-0.30.2.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
+
sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
+
md5 = "";
+
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
}
{
-
name = "nss-3.29.5-with-nspr-4.13.1.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz";
-
sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4";
+
name = "nss-3.33-with-nspr-4.17.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz";
+
sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4";
md5 = "";
-
md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz";
+
md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2";
sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2";
md5 = "";
-
md5name = "-libodfgen-0.1.6.tar.bz2";
+
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
}
{
-
name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
-
url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
-
sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34";
-
md5 = "a084cd548b586552cb7d3ee51f1af969";
-
md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar";
+
name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
+
url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
+
sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf";
+
md5 = "";
+
md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar";
}
{
name = "officeotron-0.7.4-master.jar";
···
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
}
{
-
name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
-
sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4";
-
md5 = "";
-
md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2";
-
}
-
{
-
name = "openldap-2.4.44.tgz";
-
url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
-
sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
+
name = "openldap-2.4.45.tgz";
+
url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
+
sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
md5 = "";
-
md5name = "-openldap-2.4.44.tgz";
+
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
-
name = "openssl-1.0.2k.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
-
sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
+
name = "openssl-1.0.2m.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
+
sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
md5 = "";
-
md5name = "-openssl-1.0.2k.tar.gz";
+
md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
}
{
-
name = "liborcus-0.12.1.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
-
sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
+
name = "liborcus-0.13.1.tar.gz";
+
url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";
+
sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937";
md5 = "";
-
md5name = "-liborcus-0.12.1.tar.gz";
+
md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb";
md5 = "";
-
md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+
md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
-
name = "libpagemaker-0.0.3.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
-
sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
+
name = "libpagemaker-0.0.4.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
+
sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";
md5 = "";
-
md5name = "-libpagemaker-0.0.3.tar.bz2";
+
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
-
name = "pdfium-3064.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2";
-
sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883";
+
name = "pdfium-3235.tar.bz2";
+
url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
+
sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
md5 = "";
-
md5name = "-pdfium-3064.tar.bz2";
+
md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";
···
md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
}
{
-
name = "libpng-1.6.28.tar.gz";
-
url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
-
sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+
name = "libpng-1.6.34.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz";
+
sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6";
md5 = "";
-
md5name = "-libpng-1.6.28.tar.gz";
+
md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
}
{
-
name = "poppler-0.56.0.tar.xz";
-
url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz";
-
sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173";
+
name = "poppler-0.59.0.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";
+
sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641";
md5 = "";
-
md5name = "-poppler-0.56.0.tar.xz";
+
md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
···
url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
md5 = "";
-
md5name = "-Python-3.5.4.tgz";
+
md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+
}
+
{
+
name = "libqxp-0.0.1.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz";
+
sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73";
+
md5 = "";
+
md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz";
}
{
name = "raptor2-2.0.15.tar.gz";
···
url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";
sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf";
md5 = "";
-
md5name = "-librevenge-0.0.4.tar.bz2";
+
md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2";
}
{
name = "rhino1_5R5.zip";
···
url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2";
sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700";
md5 = "";
-
md5name = "-serf-1.2.1.tar.bz2";
+
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
}
{
-
name = "libstaroffice-0.0.3.tar.xz";
-
url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz";
-
sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6";
+
name = "libstaroffice-0.0.5.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
+
sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
md5 = "";
-
md5name = "-libstaroffice-0.0.3.tar.xz";
+
md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
}
{
name = "swingExSrc.zip";
···
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
}
{
-
name = "libvisio-0.1.5.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
-
sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e";
+
name = "libvisio-0.1.6.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
+
sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
md5 = "";
-
md5name = "-libvisio-0.1.5.tar.bz2";
+
md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
}
{
-
name = "libwpd-0.10.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";
-
sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d";
+
name = "libwpd-0.10.2.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz";
+
sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610";
md5 = "";
-
md5name = "-libwpd-0.10.1.tar.bz2";
+
md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz";
}
{
-
name = "libwpg-0.3.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";
-
sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59";
+
name = "libwpg-0.3.2.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";
+
sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33";
md5 = "";
-
md5name = "-libwpg-0.3.1.tar.bz2";
+
md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
}
{
-
name = "libwps-0.4.6.tar.xz";
-
url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz";
-
sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0";
+
name = "libwps-0.4.8.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
+
sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
md5 = "";
-
md5name = "-libwps-0.4.6.tar.xz";
+
md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
···
url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz";
sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066";
md5 = "";
-
md5name = "-zlib-1.2.11.tar.xz";
+
md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
}
{
-
name = "libzmf-0.0.1.tar.bz2";
-
url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
-
sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
+
name = "libzmf-0.0.2.tar.xz";
+
url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
+
sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";
md5 = "";
-
md5name = "-libzmf-0.0.1.tar.bz2";
+
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
]
+17 -8
pkgs/data/fonts/cantarell-fonts/default.nix
···
-
{ stdenv, fetchurl }:
+
{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }:
-
stdenv.mkDerivation rec {
-
major = "0.0";
-
minor = "25";
-
name = "cantarell-fonts-${major}.${minor}";
+
let
+
pname = "cantarell-fonts";
+
version = "0.100";
+
in stdenv.mkDerivation rec {
+
name = "${pname}-${version}";
src = fetchurl {
-
url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz";
-
sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl";
+
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+
sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81";
};
+
nativeBuildInputs = [ meson ninja gettext appstream-glib ];
+
outputHashAlgo = "sha256";
outputHashMode = "recursive";
-
outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2";
+
outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1";
+
+
passthru = {
+
updateScript = gnome3.updateScript {
+
packageName = pname;
+
};
+
};
meta = {
description = "Default typeface used in the user interface of GNOME since version 3.0";
+39
pkgs/data/icons/deepin-icon-theme/default.nix
···
+
{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }:
+
+
stdenv.mkDerivation rec {
+
name = "${pname}-${version}";
+
pname = "deepin-icon-theme";
+
version = "15.12.52";
+
+
src = fetchFromGitHub {
+
owner = "linuxdeepin";
+
repo = pname;
+
rev = version;
+
sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l";
+
+
# Get rid of case collision in file names, which is an issue in
+
# darwin where file names are case insensitive.
+
extraPostFetch = ''
+
rm "$out"/Sea/apps/scalable/TeXmacs.svg
+
rm "$out"/deepin/apps/48/TeXmacs.svg
+
'';
+
};
+
+
nativeBuildInputs = [ gtk3 papirus-icon-theme ];
+
+
makeFlags = [ "PREFIX=$(out)" ];
+
+
postFixup = ''
+
for theme in $out/share/icons/*; do
+
gtk-update-icon-cache $theme
+
done
+
'';
+
+
meta = with stdenv.lib; {
+
description = "Deepin icon theme";
+
homepage = https://github.com/linuxdeepin/deepin-icon-theme;
+
license = licenses.gpl3;
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ romildo ];
+
};
+
}
+2 -2
pkgs/data/icons/papirus-icon-theme/default.nix
···
stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}";
-
version = "20171102";
+
version = "20180214";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme";
rev = version;
-
sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq";
+
sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki";
};
nativeBuildInputs = [ gtk3 ];
+2 -2
pkgs/data/misc/hackage/default.nix
···
{ fetchurl }:
fetchurl {
-
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/acac7d958b43c270c8411fc65895a531e496423f.tar.gz";
-
sha256 = "15crmzdnj7lpbkhb44vhh7g0ghw0xj4cqkyqyg638dslijc5mjzd";
+
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f6344416728bff8b5279e0c45941fd8da361eb9.tar.gz";
+
sha256 = "0zm53wxvm7z72605qvgv0dzsfq91lyffpr850cks23r979pjvkv8";
}
-3
pkgs/desktops/gnome-2/default.nix
···
gnome_common = gnome-common;
gnome_keyring = gnome-keyring;
gnome_desktop = gnome-desktop;
-
gnome_session = gnome-session;
gnome_settings_daemon = gnome-settings-daemon;
gnome_control_center = gnome-control-center;
···
gnome-desktop = callPackage ./desktop/gnome-desktop { };
gnome_panel = callPackage ./desktop/gnome-panel { };
-
-
gnome-session = callPackage ./desktop/gnome-session { };
gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { };
-20
pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, dbus-glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto
-
, intltool, libglade, startup_notification, GConf, upower, libSM }:
-
-
stdenv.mkDerivation {
-
name = "gnome-session-2.32.1";
-
-
src = fetchurl {
-
url = mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2;
-
sha256 = "0sk8qclarpar27va1ahzwjh2wsafys0xsdjzdg7cgygw6gj3rn92";
-
};
-
-
buildInputs =
-
[ dbus-glib gtk libXau libXtst inputproto libglade startup_notification
-
GConf upower libSM
-
];
-
nativeBuildInputs = [ pkgconfig intltool ];
-
-
# gconf-sanity-check-2 not found
-
meta.broken = true;
-
}
+1 -1
pkgs/development/haskell-modules/configuration-common.nix
···
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version;
-
sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq";
+
sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w";
};
})).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+1083 -203
pkgs/development/haskell-modules/hackage-packages.nix
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"Glob_0_9_2" = callPackage
+
({ mkDerivation, base, containers, directory, dlist, filepath
+
, HUnit, QuickCheck, test-framework, test-framework-hunit
+
, test-framework-quickcheck2, transformers, transformers-compat
+
}:
+
mkDerivation {
+
pname = "Glob";
+
version = "0.9.2";
+
sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
+
libraryHaskellDepends = [
+
base containers directory dlist filepath transformers
+
transformers-compat
+
];
+
testHaskellDepends = [
+
base containers directory dlist filepath HUnit QuickCheck
+
test-framework test-framework-hunit test-framework-quickcheck2
+
transformers transformers-compat
+
];
+
homepage = "http://iki.fi/matti.niemenmaa/glob/";
+
description = "Globbing library";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"GlomeTrace" = callPackage
({ mkDerivation, array, base, GlomeVec }:
mkDerivation {
···
pname = "HarmTrace-Base";
version = "1.6.0.0";
sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b";
+
revision = "1";
+
editedCabalFile = "0fldc14b2lj8pvkmxly0ld9mmx33yvswh7sg85g62w4yixsr6fdl";
libraryHaskellDepends = [
base binary containers ghc-prim ListLike uu-parsinglib
];
···
base binary containers ghc-prim ListLike QuickCheck random
uu-parsinglib
];
-
homepage = "https://bitbucket.org/bash/harmtrace-base";
+
homepage = "https://github.com/chordify/HarmTrace-Base";
description = "Parsing and unambiguously representing musical chords";
license = stdenv.lib.licenses.lgpl3;
}) {};
···
({ mkDerivation, base, containers, hmatrix, vector }:
mkDerivation {
pname = "Learning";
-
version = "0.0.3";
-
sha256 = "0mq98i23gcksvbyz2psxixp4jdqjskmjbjc2z8bz175sy8fyp62a";
+
version = "0.1.0";
+
sha256 = "14hlr86c605bpfcawvi4vy0hcwph4ji38ql8pic6bawyvcn7pybn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers hmatrix vector ];
···
({ mkDerivation, base }:
mkDerivation {
pname = "Mapping";
-
version = "0.1.0.1";
-
sha256 = "14gjly5dlz5bdi9niqdg6gzf9hin87xnl9hsqlzdpgbk6hzg0az8";
+
version = "2.0.0.0";
+
sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/zaoqi/Mapping.hs";
description = "Mapping";
···
description = "High-level abstraction over 9P protocol";
license = "unknown";
+
}) {};
+
+
"Network-NineP_0_4_2" = callPackage
+
({ mkDerivation, base, binary, bytestring, containers, convertible
+
, exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
+
, network, NineP, regex-posix, stateref, transformers
+
}:
+
mkDerivation {
+
pname = "Network-NineP";
+
version = "0.4.2";
+
sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d";
+
isLibrary = true;
+
isExecutable = true;
+
libraryHaskellDepends = [
+
base binary bytestring containers convertible exceptions hslogger
+
monad-loops monad-peel mstate mtl network NineP regex-posix
+
stateref transformers
+
];
+
description = "High-level abstraction over 9P protocol";
+
license = "unknown";
+
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"NewBinary" = callPackage
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"async-timer_0_2_0_0" = callPackage
+
({ mkDerivation, async, base, containers, criterion
+
, safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core
+
}:
+
mkDerivation {
+
pname = "async-timer";
+
version = "0.2.0.0";
+
sha256 = "1q6f0ig8m1ij1yz07b36799gavppb7dkwyvlc724gaj1q72bych6";
+
libraryHaskellDepends = [
+
async base safe-exceptions unliftio unliftio-core
+
];
+
testHaskellDepends = [
+
async base containers criterion tasty tasty-hunit
+
];
+
homepage = "https://github.com/mtesseract/async-timer#readme";
+
description = "Provides API for timer based execution of IO actions";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"asynchronous-exceptions" = callPackage
({ mkDerivation, base }:
mkDerivation {
···
}) {};
"ats-pkg" = callPackage
-
({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary
-
, bytestring, bzlib, Cabal, cli-setup, composition-prelude
-
, containers, cpphs, dependency, dhall, directory, file-embed
-
, http-client, http-client-tls, lens, lzma, optparse-applicative
-
, parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
-
, text, unix, zip-archive, zlib
+
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
+
, Cabal, cli-setup, composition-prelude, containers, dependency
+
, dhall, directory, file-embed, filemanip, http-client
+
, http-client-tls, lzma, microlens, microlens-th
+
, optparse-applicative, parallel-io, process, shake, shake-ats
+
, shake-ext, tar, temporary, text, unix, zip-archive, zlib
mkDerivation {
pname = "ats-pkg";
-
version = "2.6.1.3";
-
sha256 = "0qxzcmbvc0s30w10whlr0lxmj5rcidma1gv03gwih7ax4bnw0ww4";
+
version = "2.6.1.16";
+
sha256 = "0wbdndrc6vwac8qyihz52cbhd6nv5sjvw7ssrl8g92gziwjbrgf3";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
libraryHaskellDepends = [
-
ansi-wl-pprint ats-setup base binary bytestring bzlib Cabal
+
ansi-wl-pprint base binary bytestring bzlib Cabal
composition-prelude containers dependency dhall directory
-
file-embed http-client http-client-tls lens lzma parallel-io
-
process shake shake-ats shake-ext tar text unix zip-archive zlib
+
file-embed filemanip http-client http-client-tls lzma microlens
+
microlens-th parallel-io process shake shake-ats shake-ext tar text
+
unix zip-archive zlib
-
libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
-
base composition-prelude directory lens optparse-applicative shake
-
shake-ats temporary text
+
base composition-prelude directory microlens optparse-applicative
+
shake shake-ats temporary text
homepage = "https://github.com/vmchale/atspkg#readme";
description = "A build tool for ATS";
···
pname = "bifunctors";
version = "5.5.2";
sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark";
-
revision = "1";
-
editedCabalFile = "0jasyhyzn0bjy5b05bvi857vsanf9kgk9rcirlw5mc7wqlxxi6mq";
+
revision = "2";
+
editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319";
libraryHaskellDepends = [
base base-orphans comonad containers semigroups tagged
template-haskell th-abstraction transformers transformers-compat
···
pname = "case-insensitive";
version = "1.2.0.10";
sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
-
revision = "1";
-
editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi";
+
revision = "2";
+
editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx";
libraryHaskellDepends = [ base bytestring deepseq hashable text ];
testHaskellDepends = [
base bytestring HUnit test-framework test-framework-hunit text
···
mkDerivation {
pname = "cloudi";
-
version = "1.7.2";
-
sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f";
+
version = "1.7.3";
+
sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179";
libraryHaskellDepends = [
array base binary bytestring containers network time unix zlib
···
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
-
version = "1.3.0.3";
-
sha256 = "050w2h7all9r9rd68xq2d8cxg78ca8xh5b2ys17apla3amm9a7xi";
+
version = "1.3.0.4";
+
sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/vmchale/composition-prelude#readme";
description = "Higher-order function combinators";
···
license = stdenv.lib.licenses.mit;
}) {};
-
"concurrency_1_4_0_0" = callPackage
+
"concurrency_1_4_0_1" = callPackage
({ mkDerivation, array, atomic-primops, base, exceptions
, monad-control, mtl, stm, transformers
mkDerivation {
pname = "concurrency";
-
version = "1.4.0.0";
-
sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r";
+
version = "1.4.0.1";
+
sha256 = "17i50sxfir5nf6ldc14h6wfa03ap7z4lmihd8qpl2mb0px5ak7b9";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
···
description = "Ungarble output from several threads or commands";
license = stdenv.lib.licenses.bsd2;
+
}) {};
+
+
"concurrent-output_1_10_4" = callPackage
+
({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+
, process, stm, terminal-size, text, transformers, unix
+
}:
+
mkDerivation {
+
pname = "concurrent-output";
+
version = "1.10.4";
+
sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay";
+
libraryHaskellDepends = [
+
ansi-terminal async base directory exceptions process stm
+
terminal-size text transformers unix
+
];
+
description = "Ungarble output from several threads or commands";
+
license = stdenv.lib.licenses.bsd2;
+
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"concurrent-rpc" = callPackage
···
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+
"constaparser" = callPackage
+
({ mkDerivation, attoparsec, base, bytestring, vector }:
+
mkDerivation {
+
pname = "constaparser";
+
version = "0.1.0.0";
+
sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d";
+
libraryHaskellDepends = [ attoparsec base bytestring vector ];
+
homepage = "https://github.com/chessai/constaparser";
+
description = "Parse ByteStrings of a constant length";
+
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
"constrained-categories" = callPackage
({ mkDerivation, base, tagged, void }:
mkDerivation {
···
pname = "constrained-normal";
version = "1.0.2";
sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac";
+
revision = "1";
+
editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj";
libraryHaskellDepends = [ base ];
homepage = "http://dx.doi.org/10.1145/2500365.2500602";
description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
···
license = stdenv.lib.licenses.mit;
}) {};
+
"contravariant-extras_0_3_4" = callPackage
+
({ mkDerivation, base, base-prelude, contravariant, semigroups
+
, template-haskell, tuple-th
+
}:
+
mkDerivation {
+
pname = "contravariant-extras";
+
version = "0.3.4";
+
sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n";
+
libraryHaskellDepends = [
+
base base-prelude contravariant semigroups template-haskell
+
tuple-th
+
];
+
homepage = "https://github.com/nikita-volkov/contravariant-extras";
+
description = "Extras for the \"contravariant\" package";
+
license = stdenv.lib.licenses.mit;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"control-bool" = callPackage
({ mkDerivation, base }:
mkDerivation {
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"csv-conduit_0_6_8" = callPackage
+
({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
+
, conduit, conduit-extra, containers, data-default, directory
+
, exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
+
, primitive, resourcet, test-framework, test-framework-hunit, text
+
, transformers, unordered-containers, vector
+
}:
+
mkDerivation {
+
pname = "csv-conduit";
+
version = "0.6.8";
+
sha256 = "1rb2dkci33gmqr82a4fc74lrdvxrcn0aibh3arlylklhm15y7w7y";
+
libraryHaskellDepends = [
+
array attoparsec base blaze-builder bytestring conduit
+
conduit-extra containers data-default exceptions ghc-prim mmorph
+
monad-control mtl primitive resourcet text transformers
+
unordered-containers vector
+
];
+
testHaskellDepends = [
+
base bytestring containers directory HUnit mtl primitive
+
test-framework test-framework-hunit text transformers vector
+
];
+
homepage = "http://github.com/ozataman/csv-conduit";
+
description = "A flexible, fast, conduit-based CSV parser library for Haskell";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"csv-enumerator" = callPackage
({ mkDerivation, attoparsec, attoparsec-enumerator, base
, bytestring, containers, directory, enumerator, safe, transformers
···
pname = "cue-sheet";
version = "1.0.1";
sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
+
revision = "1";
+
editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class exceptions megaparsec
···
({ mkDerivation, base }:
mkDerivation {
pname = "data-list-zigzag";
-
version = "0.1.1.0";
-
sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y";
+
version = "0.1.1.1";
+
sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q";
libraryHaskellDepends = [ base ];
homepage = "https://github.com/erisco/data-list-zigzag";
description = "A list but with a balanced enumeration of Cartesian product";
···
license = stdenv.lib.licenses.mit;
}) {};
-
"dejafu_1_1_0_0" = callPackage
+
"dejafu_1_1_0_1" = callPackage
({ mkDerivation, base, concurrency, containers, deepseq, exceptions
, leancheck, profunctors, random, ref-fd, transformers
mkDerivation {
pname = "dejafu";
-
version = "1.1.0.0";
-
sha256 = "1zrr7h84lgqm1lzl3cm2clvhrixpv2ywrjgbwbmrlfwr054v3mnm";
+
version = "1.1.0.1";
+
sha256 = "0mhzij16sqgckk62n4mdwnkmrv2vp7884ivr24wnl73xwcyw6v15";
libraryHaskellDepends = [
base concurrency containers deepseq exceptions leancheck
profunctors random ref-fd transformers
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"direct-sqlite_2_3_22" = callPackage
+
({ mkDerivation, base, base16-bytestring, bytestring, directory
+
, HUnit, temporary, text
+
}:
+
mkDerivation {
+
pname = "direct-sqlite";
+
version = "2.3.22";
+
sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a";
+
libraryHaskellDepends = [ base bytestring text ];
+
testHaskellDepends = [
+
base base16-bytestring bytestring directory HUnit temporary text
+
];
+
homepage = "https://github.com/IreneKnapp/direct-sqlite";
+
description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"directed-cubical" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, hashable
, parallel, QuickCheck, unordered-containers, vector
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"ekg-core_0_1_1_4" = callPackage
+
({ mkDerivation, base, containers, ghc-prim, text
+
, unordered-containers
+
}:
+
mkDerivation {
+
pname = "ekg-core";
+
version = "0.1.1.4";
+
sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
+
libraryHaskellDepends = [
+
base containers ghc-prim text unordered-containers
+
];
+
benchmarkHaskellDepends = [ base ];
+
homepage = "https://github.com/tibbe/ekg-core";
+
description = "Tracking of system metrics";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"ekg-elastic" = callPackage
({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
, http-client, lens, text, time, unordered-containers, wreq
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"errors_2_2_3" = callPackage
+
"errors_2_2_4" = callPackage
({ mkDerivation, base, exceptions, safe, text, transformers
, transformers-compat, unexceptionalio
mkDerivation {
pname = "errors";
-
version = "2.2.3";
-
sha256 = "1r33q7nfikm7pzgaag3zx5am60445vwh446wc1zmj1l5miwz3scw";
+
version = "2.2.4";
+
sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a";
libraryHaskellDepends = [
base exceptions safe text transformers transformers-compat
unexceptionalio
···
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+
"eternity" = callPackage
+
({ mkDerivation, attoparsec, base, cereal, directory, foldl, potoki
+
, potoki-cereal, QuickCheck, quickcheck-instances, rerebase, tasty
+
, tasty-hunit, tasty-quickcheck, text
+
}:
+
mkDerivation {
+
pname = "eternity";
+
version = "0.1";
+
sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b";
+
libraryHaskellDepends = [
+
attoparsec base cereal directory foldl potoki potoki-cereal text
+
];
+
testHaskellDepends = [
+
cereal directory potoki potoki-cereal QuickCheck
+
quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+
];
+
homepage = "https://github.com/metrix-ai/eternity";
+
description = "Native event-sourcing database";
+
license = stdenv.lib.licenses.mit;
+
}) {};
+
+
"eternity-timestamped" = callPackage
+
({ mkDerivation, attoparsec, base, cereal, directory, eternity
+
, foldl, generic-random, hashable, potoki, QuickCheck, text, time
+
}:
+
mkDerivation {
+
pname = "eternity-timestamped";
+
version = "0.2.1";
+
sha256 = "0pqihqhq2jh1sr30wkk6sy3p5zyw62i3fqqac48lciggzpmajaa2";
+
libraryHaskellDepends = [
+
attoparsec base cereal directory eternity foldl generic-random
+
hashable potoki QuickCheck text time
+
];
+
homepage = "https://github.com/metrix-ai/eternity-timestamped";
+
description = "Automatic timestamping for Eternity";
+
license = stdenv.lib.licenses.mit;
+
}) {};
+
"ether" = callPackage
({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim
, lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged
···
mkDerivation {
pname = "fast-tags";
-
version = "1.3";
-
sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq";
+
version = "1.4";
+
sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
···
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+
"fcg" = callPackage
+
({ mkDerivation }:
+
mkDerivation {
+
pname = "fcg";
+
version = "0.0.0";
+
sha256 = "07qbka3fkkmc18crafh6c5ahs7fv1a1kfhga8mxfkm75k3h15h3l";
+
isLibrary = false;
+
isExecutable = true;
+
description = "TBA";
+
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
"fckeditor" = callPackage
({ mkDerivation, base, cgi, HaXml, xhtml }:
mkDerivation {
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"filecache_0_3_0" = callPackage
+
"filecache_0_3_1" = callPackage
({ mkDerivation, base, containers, directory, exceptions, filepath
, fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
mkDerivation {
pname = "filecache";
-
version = "0.3.0";
-
sha256 = "0lizyqksip8vw7gf0zi4ggfh07ql43avim25dwdlk9blv7kyxng4";
+
version = "0.3.1";
+
sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7";
libraryHaskellDepends = [
base containers directory exceptions filepath fsnotify mtl stm
strict-base-types time
···
mkDerivation {
pname = "fix-imports";
-
version = "1.0.5";
-
sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb";
+
version = "1.1.0";
+
sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
···
pname = "flac";
version = "0.1.2";
sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
+
revision = "1";
+
editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class directory exceptions
···
pname = "ghc-paths";
version = "0.1.0.9";
sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-
revision = "2";
-
editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk";
+
revision = "3";
+
editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
description = "Knowledge of GHC's installation directories";
···
, sandi, securemem, shakespeare, socks, split, stm, stm-chans
, tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
, template-haskell, text, time, torrent, transformers, unix
-
, unix-compat, unordered-containers, utf8-string, uuid, wai
+
, unix-compat, unordered-containers, utf8-string, uuid, vector, wai
, wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
, yesod-form, yesod-static
mkDerivation {
pname = "git-annex";
-
version = "6.20180112";
-
sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw";
+
version = "6.20180227";
+
sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
···
securemem shakespeare socks split stm stm-chans tagsoup tasty
tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
torrent transformers unix unix-compat unordered-containers
-
utf8-string uuid wai wai-extra warp warp-tls yesod yesod-core
-
yesod-form yesod-static
+
utf8-string uuid vector wai wai-extra warp warp-tls yesod
+
yesod-core yesod-form yesod-static
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
···
license = stdenv.lib.licenses.mit;
}) {};
+
"github-webhooks" = callPackage
+
({ mkDerivation, aeson, base, base16-bytestring, bytestring
+
, cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
+
, vector
+
}:
+
mkDerivation {
+
pname = "github-webhooks";
+
version = "0.9.0";
+
sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f";
+
libraryHaskellDepends = [
+
aeson base base16-bytestring bytestring cryptonite deepseq
+
deepseq-generics memory text time vector
+
];
+
testHaskellDepends = [ aeson base bytestring hspec text vector ];
+
homepage = "https://github.com/onrock-eng/github-webhooks#readme";
+
description = "Aeson instances for GitHub Webhook payloads";
+
license = stdenv.lib.licenses.mit;
+
}) {};
+
"gitignore" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, http-conduit, network, safe, text
···
}) {};
"gnome-keyring" = callPackage
-
({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time
+
({ mkDerivation, base, bytestring, c2hs, gnome_keyring, text, time
mkDerivation {
pname = "gnome-keyring";
version = "0.3.1";
sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
libraryHaskellDepends = [ base bytestring text time ];
-
librarySystemDepends = [ gnome-keyring ];
-
libraryPkgconfigDepends = [ gnome-keyring ];
+
librarySystemDepends = [ gnome_keyring ];
+
libraryPkgconfigDepends = [ gnome_keyring ];
libraryToolDepends = [ c2hs ];
homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
description = "Bindings for libgnome-keyring";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
-
}) {inherit (pkgs.gnome2) gnome-keyring;};
+
}) {gnome_keyring = null;};
"gnomevfs" = callPackage
({ mkDerivation, array, base, containers, glib, gnome_vfs
···
pname = "hasbolt";
version = "0.1.3.0";
sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx";
+
revision = "1";
+
editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
data-default hex network text transformers
···
}) {};
"haskelzinc" = callPackage
-
({ mkDerivation, base, containers, filepath, parsec3, pretty
-
, process
+
({ mkDerivation, base, containers, directory, filepath, parsec
+
, pretty, process
mkDerivation {
pname = "haskelzinc";
-
version = "0.3.0.9";
-
sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s";
+
version = "0.3.1.0";
+
sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
-
base containers filepath parsec3 pretty process
+
base containers directory filepath parsec pretty process
description = "CP in Haskell through MiniZinc";
license = stdenv.lib.licenses.bsd3;
···
"hedgehog-gen-json" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, exceptions
-
, hedgehog, lens, protolude, regex-genex, regex-posix, scientific
-
, tasty, tasty-hedgehog, text, unordered-containers, vector
+
, hedgehog, lens, protolude, regex-genex, regex-pcre, scientific
+
, tasty, tasty-hedgehog, text, time, timerep, tz
+
, unordered-containers, vector
mkDerivation {
pname = "hedgehog-gen-json";
-
version = "0.1.0";
-
sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4";
+
version = "0.2.0";
+
sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm";
libraryHaskellDepends = [
aeson base bytestring containers exceptions hedgehog lens protolude
-
regex-genex scientific text unordered-containers vector
+
regex-genex scientific text time timerep tz unordered-containers
+
vector
testHaskellDepends = [
aeson base bytestring containers exceptions hedgehog lens protolude
-
regex-genex regex-posix scientific tasty tasty-hedgehog text
-
unordered-containers vector
+
regex-genex regex-pcre scientific tasty tasty-hedgehog text time
+
timerep tz unordered-containers vector
homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme";
description = "JSON generators for Hedgehog";
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"here_1_2_13" = callPackage
+
({ mkDerivation, base, haskell-src-meta, mtl, parsec
+
, template-haskell
+
}:
+
mkDerivation {
+
pname = "here";
+
version = "1.2.13";
+
sha256 = "001wfyvigl2xswqysnpignkl124hybf833875mkcsn8yp8krqvs0";
+
libraryHaskellDepends = [
+
base haskell-src-meta mtl parsec template-haskell
+
];
+
homepage = "https://github.com/tmhedberg/here";
+
description = "Here docs & interpolated strings via quasiquotation";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"heredoc" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
···
license = "GPL";
}) {inherit (pkgs) gsl;};
+
"hmatrix-gsl_0_18_2_0" = callPackage
+
({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
+
}:
+
mkDerivation {
+
pname = "hmatrix-gsl";
+
version = "0.18.2.0";
+
sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs";
+
libraryHaskellDepends = [
+
array base hmatrix process random vector
+
];
+
libraryPkgconfigDepends = [ gsl ];
+
homepage = "https://github.com/albertoruiz/hmatrix";
+
description = "Numerical computation";
+
license = "GPL";
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {inherit (pkgs) gsl;};
+
"hmatrix-gsl-stats" = callPackage
({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
, vector
···
mkDerivation {
pname = "hs-rs-notify";
-
version = "0.1.0.3";
-
sha256 = "0nrhks103kcj8m0f20gp3bgg21pvi4v1vaif275pra4bv0bzl3nh";
+
version = "0.1.0.18";
+
sha256 = "0ffs9bbs076i3a44zszhv8kdxalz2m2yfg0fham971jil33gx2pc";
+
isLibrary = true;
+
isExecutable = true;
libraryHaskellDepends = [
base filepath process protolude text unix
-
librarySystemDepends = [ notifier ];
+
executableHaskellDepends = [ base protolude ];
+
executableSystemDepends = [ notifier ];
testHaskellDepends = [ base protolude ];
homepage = "https://github.com/NoRedInk/hs-rs-notify#readme";
description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
···
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) lua5_3;};
+
"hslua_0_9_5_1" = callPackage
+
({ mkDerivation, base, bytestring, containers, exceptions, fail
+
, lua5_3, mtl, QuickCheck, quickcheck-instances, tasty
+
, tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
+
}:
+
mkDerivation {
+
pname = "hslua";
+
version = "0.9.5.1";
+
sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8";
+
configureFlags = [ "-fsystem-lua" ];
+
libraryHaskellDepends = [
+
base bytestring containers exceptions fail mtl text
+
];
+
librarySystemDepends = [ lua5_3 ];
+
testHaskellDepends = [
+
base bytestring containers QuickCheck quickcheck-instances tasty
+
tasty-expected-failure tasty-hunit tasty-quickcheck text
+
];
+
description = "A Lua language interpreter embedding in Haskell";
+
license = stdenv.lib.licenses.mit;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {inherit (pkgs) lua5_3;};
+
"hslua-aeson" = callPackage
({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
, ieee754, QuickCheck, quickcheck-instances, scientific, text
···
}) {};
"hspkcs11" = callPackage
-
({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes
-
, crypto-api, RSA, unix, utf8-string
+
({ mkDerivation, base, base64-bytestring, bytestring, c2hs
+
, cipher-aes, cprng-aes, crypto-api, RSA, unix, utf8-string
mkDerivation {
pname = "hspkcs11";
-
version = "0.5";
-
sha256 = "028vri05152a983w87c3zm6byhqrcws3zqk9f419anmhmvz0akwx";
-
isLibrary = true;
-
isExecutable = true;
+
version = "0.6";
+
sha256 = "12jjz5r6pcqqlalxagi1bv1igjfwz7npbdr8vm4kznhv44bkhlp7";
libraryHaskellDepends = [ base bytestring unix utf8-string ];
libraryToolDepends = [ c2hs ];
-
executableHaskellDepends = [
-
base bytestring cipher-aes cprng-aes crypto-api RSA unix
-
utf8-string
+
testHaskellDepends = [
+
base base64-bytestring bytestring cipher-aes cprng-aes crypto-api
+
RSA unix utf8-string
homepage = "https://github.com/denisenkom/hspkcs11";
description = "Wrapper for PKCS #11 interface";
···
license = stdenv.lib.licenses.mit;
}) {};
-
"hunit-dejafu_1_0_1_1" = callPackage
+
"hunit-dejafu_1_0_1_2" = callPackage
({ mkDerivation, base, dejafu, exceptions, HUnit }:
mkDerivation {
pname = "hunit-dejafu";
-
version = "1.0.1.1";
-
sha256 = "0q3a9pxmg8w2q3h38rz1yd7hhf0q4j1aq00ssgnnr2pzvnqgizya";
+
version = "1.0.1.2";
+
sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7";
libraryHaskellDepends = [ base dejafu exceptions HUnit ];
homepage = "https://github.com/barrucadu/dejafu";
description = "Deja Fu support for the HUnit test framework";
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"hw-hspec-hedgehog_0_1_0_2" = callPackage
+
({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
+
mkDerivation {
+
pname = "hw-hspec-hedgehog";
+
version = "0.1.0.2";
+
sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67";
+
libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
+
testHaskellDepends = [ base hedgehog hspec ];
+
homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme";
+
description = "Interoperability between hspec and hedgehog";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"hw-int" = callPackage
({ mkDerivation, base }:
mkDerivation {
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"hzenity" = callPackage
+
({ mkDerivation, base, containers, data-default, process
+
, process-extras, text, time
+
}:
+
mkDerivation {
+
pname = "hzenity";
+
version = "0.1";
+
sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk";
+
libraryHaskellDepends = [
+
base containers data-default process process-extras text time
+
];
+
homepage = "https://github.com/emilaxelsson/hzenity";
+
description = "Haskell interface to Zenity dialogs";
+
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
"hzk" = callPackage
({ mkDerivation, base, bytestring, resource-pool, tasty
, tasty-hunit, time, zookeeper_mt
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"identicon-style-squares" = callPackage
+
({ mkDerivation, base, bytestring, cryptohash, identicon
+
, JuicyPixels, polyvariadic
+
}:
+
mkDerivation {
+
pname = "identicon-style-squares";
+
version = "0.1.0.0";
+
sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9";
+
libraryHaskellDepends = [
+
base identicon JuicyPixels polyvariadic
+
];
+
testHaskellDepends = [
+
base bytestring cryptohash identicon JuicyPixels
+
];
+
homepage = "https://github.com/fgaz/identicon-styles";
+
description = "Squares style for the identicon package";
+
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
"identifiers" = callPackage
({ mkDerivation, base, binary, bytestring, cereal, containers
, criterion, deepseq, hashable, ListLike, QuickCheck
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"inline-java_0_8_2" = callPackage
+
({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
+
, hspec, jni, jvm, language-java, mtl, process, template-haskell
+
, temporary, text
+
}:
+
mkDerivation {
+
pname = "inline-java";
+
version = "0.8.2";
+
sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy";
+
libraryHaskellDepends = [
+
base bytestring Cabal directory filepath ghc jni jvm language-java
+
mtl process template-haskell temporary text
+
];
+
testHaskellDepends = [ base hspec jni jvm text ];
+
homepage = "http://github.com/tweag/inline-java#readme";
+
description = "Java interop via inline Java code in Haskell modules";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"inline-r" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, data-default-class, deepseq, directory, exceptions, filepath
···
license = stdenv.lib.licenses.mit;
}) {};
-
"irc-client_1_1_0_0" = callPackage
+
"irc-client_1_1_0_1" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, containers
, contravariant, exceptions, irc-conduit, irc-ctcp, mtl
, network-conduit-tls, old-locale, profunctors, stm, stm-chans
···
mkDerivation {
pname = "irc-client";
-
version = "1.1.0.0";
-
sha256 = "0xg4carlcrzjh8igvnqwmxp64ha7x2wjp5d5lvadbml36zvq189y";
+
version = "1.1.0.1";
+
sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag";
libraryHaskellDepends = [
base bytestring conduit connection containers contravariant
exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
···
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "is";
-
version = "0.4";
-
sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz";
-
libraryHaskellDepends = [ base ];
+
version = "0.4.1";
+
sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a";
+
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base template-haskell ];
description = "Generic pattern predicates";
license = stdenv.lib.licenses.bsd3;
···
mkDerivation {
pname = "jammittools";
-
version = "0.5.3.2";
-
sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0";
+
version = "0.5.4";
+
sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
description = "Complete JNI raw bindings";
license = stdenv.lib.licenses.bsd3;
+
}) {inherit (pkgs) jdk;};
+
+
"jni_0_6_0" = callPackage
+
({ mkDerivation, base, bytestring, choice, constraints, containers
+
, cpphs, deepseq, inline-c, jdk, singletons
+
}:
+
mkDerivation {
+
pname = "jni";
+
version = "0.6.0";
+
sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba";
+
libraryHaskellDepends = [
+
base bytestring choice constraints containers deepseq inline-c
+
singletons
+
];
+
librarySystemDepends = [ jdk ];
+
libraryToolDepends = [ cpphs ];
+
homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
+
description = "Complete JNI raw bindings";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) jdk;};
"jobqueue" = callPackage
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"jvm_0_4_2" = callPackage
+
({ mkDerivation, base, bytestring, choice, constraints, criterion
+
, deepseq, distributed-closure, exceptions, hspec, jni, singletons
+
, text, vector
+
}:
+
mkDerivation {
+
pname = "jvm";
+
version = "0.4.2";
+
sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh";
+
libraryHaskellDepends = [
+
base bytestring choice constraints distributed-closure exceptions
+
jni singletons text vector
+
];
+
testHaskellDepends = [ base bytestring hspec jni text ];
+
benchmarkHaskellDepends = [
+
base criterion deepseq jni singletons
+
];
+
homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
+
description = "Call JVM methods from Haskell";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
+
"jvm-batching" = callPackage
+
({ mkDerivation, base, bytestring, Cabal, criterion, deepseq
+
, distributed-closure, hspec, inline-java, jni, jvm, singletons
+
, split, text, vector
+
}:
+
mkDerivation {
+
pname = "jvm-batching";
+
version = "0.1.1";
+
sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq";
+
setupHaskellDepends = [ base Cabal inline-java ];
+
libraryHaskellDepends = [
+
base bytestring distributed-closure inline-java jni jvm singletons
+
text vector
+
];
+
testHaskellDepends = [
+
base bytestring hspec inline-java jvm text vector
+
];
+
benchmarkHaskellDepends = [
+
base criterion deepseq jvm split vector
+
];
+
homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme";
+
description = "Provides batched marshalling of values between Java and Haskell";
+
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
"jvm-binary" = callPackage
({ mkDerivation, base, binary, bytestring, containers, criterion
, directory, filepath, tasty, tasty-discover, tasty-hspec
···
}) {};
"jvm-streaming" = callPackage
-
({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
-
, jvm, singletons, streaming
+
({ mkDerivation, base, Cabal, criterion, deepseq
+
, distributed-closure, hspec, inline-java, jni, jvm, jvm-batching
+
, singletons, streaming, vector
mkDerivation {
pname = "jvm-streaming";
-
version = "0.2.2";
-
sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m";
+
version = "0.3";
+
sha256 = "02qnfs06knia1c2r5hglhf4ahrls7i6q352dykyns4x1ps5kks5r";
+
setupHaskellDepends = [ base Cabal inline-java jvm-batching ];
libraryHaskellDepends = [
-
base distributed-closure inline-java jni jvm singletons streaming
+
base distributed-closure inline-java jni jvm jvm-batching
+
singletons streaming vector
testHaskellDepends = [ base hspec inline-java jvm streaming ];
+
benchmarkHaskellDepends = [
+
base criterion deepseq jvm streaming vector
+
];
homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
description = "Expose Java iterators as streams from the streaming package";
license = stdenv.lib.licenses.bsd3;
···
pname = "netspec";
pname = "netspec";
pname = "netspec";
+
revision = "2";
+
editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3";
pname = "netspec";
pname = "netspec";
pname = "netspec";
···
pname = "netspec";
version = "0.1.1";
pname = "netspec";
+
revision = "1";
+
editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
pname = "netspec";
···
pname = "netspec";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
+
"lang" = callPackage
+
({ mkDerivation, base, bytestring, http-streams, Mapping }:
+
mkDerivation {
+
pname = "lang";
+
version = "0.2.1";
+
sha256 = "1pzj4iyrhlvgbk68d68xmfi75l2nz9ya1nm6iqz1qvmpj9rd3fsy";
+
libraryHaskellDepends = [ base bytestring http-streams Mapping ];
+
homepage = "语.ml";
+
description = "A Lisp";
+
license = stdenv.lib.licenses.agpl3;
}) {};
pname = "netspec";
···
}) {};
pname = "netspec";
-
pname = "netspec";
+
({ mkDerivation, alex, ansi-wl-pprint, array, base
pname = "netspec";
-
pname = "netspec";
-
, transformers
+
, hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes
+
, system-filepath, transformers
mkDerivation {
pname = "netspec";
-
version = "1.0.2.1";
-
pname = "netspec";
+
version = "1.2.0.0";
+
sha256 = "072a37nd9ngis8m1kx7xlr13kd8v24j3cnzllval2ygy9siw4p1l";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
-
pname = "netspec";
-
pname = "netspec";
+
ansi-wl-pprint array base composition-prelude containers deepseq
+
microlens microlens-th mtl recursion-schemes transformers
libraryToolDepends = [ alex happy ];
testHaskellDepends = [
···
({ mkDerivation, base, containers, text, transformers }:
mkDerivation {
pname = "localization";
-
version = "1.0.0.20180213";
-
sha256 = "1dpmlmpmb4hbv9b5010l5fypjmas3hb4vfmcnfnrajm7wp7qzg2y";
+
version = "1.0.1.20180226";
+
sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd";
libraryHaskellDepends = [ base containers text transformers ];
description = "Library for localization (l10n)";
license = stdenv.lib.licenses.gpl3;
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"logging-effect_1_2_4" = callPackage
+
({ mkDerivation, async, base, bytestring, criterion, exceptions
+
, fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+
, semigroups, stm, stm-delay, text, time, transformers
+
, transformers-base, wl-pprint-text
+
}:
+
mkDerivation {
+
pname = "logging-effect";
+
version = "1.2.4";
+
sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h";
+
libraryHaskellDepends = [
+
async base exceptions free monad-control mtl semigroups stm
+
stm-delay text time transformers transformers-base wl-pprint-text
+
];
+
benchmarkHaskellDepends = [
+
base bytestring criterion fast-logger lifted-async monad-logger
+
text time wl-pprint-text
+
];
+
homepage = "https://github.com/ocharles/logging-effect";
+
description = "A mtl-style monad transformer for general purpose & compositional logging";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"logging-effect-extra" = callPackage
({ mkDerivation, base, logging-effect, logging-effect-extra-file
, logging-effect-extra-handler, wl-pprint-text
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"memory_0_14_14" = callPackage
+
"memory_0_14_16" = callPackage
({ mkDerivation, base, basement, bytestring, deepseq, foundation
-
, ghc-prim, tasty, tasty-hunit, tasty-quickcheck
+
, ghc-prim
mkDerivation {
pname = "memory";
-
version = "0.14.14";
-
sha256 = "03lnb7nqshddiwqbz1vpba7mb6l80nav896rr77vlp8m41b9h6qx";
+
version = "0.14.16";
+
sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
libraryHaskellDepends = [
base basement bytestring deepseq foundation ghc-prim
-
testHaskellDepends = [
-
base basement bytestring foundation tasty tasty-hunit
-
tasty-quickcheck
-
];
+
testHaskellDepends = [ base basement bytestring foundation ];
homepage = "https://github.com/vincenthz/hs-memory";
description = "memory and related abstraction stuff";
license = stdenv.lib.licenses.bsd3;
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"modern-uri_0_2_0_0" = callPackage
+
"modern-uri_0_2_1_0" = callPackage
({ mkDerivation, base, bytestring, containers, contravariant
, criterion, deepseq, exceptions, hspec, hspec-megaparsec
, megaparsec, mtl, profunctors, QuickCheck, reflection, tagged
···
mkDerivation {
pname = "modern-uri";
-
version = "0.2.0.0";
-
sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z";
+
version = "0.2.1.0";
+
sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
revision = "1";
-
editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm";
+
editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"monad-control_1_0_2_3" = callPackage
+
({ mkDerivation, base, stm, transformers, transformers-base
+
, transformers-compat
+
}:
+
mkDerivation {
+
pname = "monad-control";
+
version = "1.0.2.3";
+
sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c";
+
libraryHaskellDepends = [
+
base stm transformers transformers-base transformers-compat
+
];
+
homepage = "https://github.com/basvandijk/monad-control";
+
description = "Lift control operations, like exception catching, through monad transformers";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"monad-control-aligned" = callPackage
({ mkDerivation, base, stm, transformers, transformers-base
, transformers-compat
···
license = stdenv.lib.licenses.asl20;
}) {};
+
"monad-logger-prefix_0_1_8" = callPackage
+
({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
+
, monad-control, monad-logger, mtl, QuickCheck, resourcet, text
+
, transformers, transformers-base
+
}:
+
mkDerivation {
+
pname = "monad-logger-prefix";
+
version = "0.1.8";
+
sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj";
+
libraryHaskellDepends = [
+
base exceptions monad-control monad-logger mtl resourcet text
+
transformers transformers-base
+
];
+
testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
+
benchmarkHaskellDepends = [ base criterion monad-logger ];
+
homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
+
description = "Add prefixes to your monad-logger output";
+
license = stdenv.lib.licenses.asl20;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"monad-logger-syslog" = callPackage
({ mkDerivation, base, bytestring, fast-logger, hsyslog
, monad-logger, text, transformers
···
homepage = "https://github.com/sellerlabs/monad-metrics#readme";
description = "A convenient wrapper around EKG metrics";
license = stdenv.lib.licenses.mit;
+
}) {};
+
+
"monad-metrics_0_2_1_1" = callPackage
+
({ mkDerivation, base, clock, ekg-core, exceptions, hashable
+
, microlens, mtl, text, transformers, unordered-containers
+
}:
+
mkDerivation {
+
pname = "monad-metrics";
+
version = "0.2.1.1";
+
sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy";
+
libraryHaskellDepends = [
+
base clock ekg-core exceptions hashable microlens mtl text
+
transformers unordered-containers
+
];
+
testHaskellDepends = [ base ];
+
homepage = "https://github.com/sellerlabs/monad-metrics#readme";
+
description = "A convenient wrapper around EKG metrics";
+
license = stdenv.lib.licenses.mit;
+
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-mock" = callPackage
···
pname = "network-msgpack-rpc";
version = "0.0.4";
sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r";
-
revision = "1";
-
editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2";
+
revision = "2";
+
editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3";
libraryHaskellDepends = [
base binary binary-conduit bytestring conduit conduit-extra
data-default-class data-default-instances-base data-msgpack
···
mkDerivation {
pname = "ogmarkup";
-
version = "4.0";
-
sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k";
+
version = "5.0";
+
sha256 = "19lgfgsfkfk51dbjimc45yclxfh7ncmh21gnc6f7dihsyhkdfsx7";
libraryHaskellDepends = [ base megaparsec mtl ];
testHaskellDepends = [
base hspec hspec-megaparsec megaparsec shakespeare text
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"optparse-applicative_0_14_2_0" = callPackage
+
({ mkDerivation, ansi-wl-pprint, base, bytestring, process
+
, QuickCheck, transformers, transformers-compat
+
}:
+
mkDerivation {
+
pname = "optparse-applicative";
+
version = "0.14.2.0";
+
sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
+
libraryHaskellDepends = [
+
ansi-wl-pprint base process transformers transformers-compat
+
];
+
testHaskellDepends = [ base bytestring QuickCheck ];
+
homepage = "https://github.com/pcapriotti/optparse-applicative";
+
description = "Utilities and combinators for parsing command line options";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"optparse-applicative-simple" = callPackage
({ mkDerivation, attoparsec, attoparsec-data, base-prelude
, optparse-applicative, rerebase, text
···
pname = "pagination";
version = "0.2.1";
sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48";
+
revision = "1";
+
editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5";
libraryHaskellDepends = [ base deepseq exceptions ];
testHaskellDepends = [ base exceptions hspec QuickCheck ];
homepage = "https://github.com/mrkkrp/pagination";
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"pandoc-citeproc_0_14_1_4" = callPackage
+
"pandoc-citeproc_0_14_1_5" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, Cabal, containers, data-default, directory, filepath, hs-bibutils
, mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
···
mkDerivation {
pname = "pandoc-citeproc";
-
version = "0.14.1.4";
-
sha256 = "1agc7qh9sfhqy329w0ccbfx081001k93qk9h6br5gx2yqizwbdd0";
+
version = "0.14.1.5";
+
sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
···
mkDerivation {
pname = "pandoc-emphasize-code";
-
version = "0.2.2";
-
sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v";
+
version = "0.2.3";
+
sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
pname = "path-io";
version = "1.3.3";
sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
+
revision = "1";
+
editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm";
libraryHaskellDepends = [
base containers directory dlist exceptions filepath path temporary
time transformers unix-compat
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"pcf-font-embed_0_1_2_0" = callPackage
+
({ mkDerivation, base, bytestring, pcf-font, template-haskell
+
, vector
+
}:
+
mkDerivation {
+
pname = "pcf-font-embed";
+
version = "0.1.2.0";
+
sha256 = "0lgx62ig2rvxcv9sgk53pfr8gkfimb1xm6lxpc2rr74mdzp52pf5";
+
libraryHaskellDepends = [
+
base bytestring pcf-font template-haskell vector
+
];
+
homepage = "https://github.com/michael-swan/pcf-font-embed";
+
description = "Template Haskell for embedding text rendered using PCF fonts";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"pcg-random" = callPackage
({ mkDerivation, base, bytestring, doctest, entropy, primitive
, random
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"pem_0_2_3" = callPackage
+
({ mkDerivation, base, bytestring, HUnit, memory, mtl, QuickCheck
+
, test-framework, test-framework-hunit, test-framework-quickcheck2
+
}:
+
mkDerivation {
+
pname = "pem";
+
version = "0.2.3";
+
sha256 = "1c8383b5zcwmv88qhfnqcrwpi5md89iqsrfblcdxl8czyvc5x973";
+
libraryHaskellDepends = [ base bytestring memory mtl ];
+
testHaskellDepends = [
+
base bytestring HUnit QuickCheck test-framework
+
test-framework-hunit test-framework-quickcheck2
+
];
+
homepage = "http://github.com/vincenthz/hs-pem";
+
description = "Privacy Enhanced Mail (PEM) format reader and writer";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"pencil" = callPackage
({ mkDerivation, base, data-default, directory, doctest
, edit-distance, feed, filepath, hashable, hsass, mtl, pandoc
···
homepage = "http://khibino.github.io/haskell-relational-record/";
description = "Binding between SQL database values and haskell records";
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
+
"persistable-record_0_6_0_1" = 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.1";
+
sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1";
+
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
···
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
-
"persistent-sqlite_2_8_1" = callPackage
+
"persistent-sqlite_2_8_1_2" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, hspec, microlens-th, monad-logger, old-locale, persistent
, persistent-template, resource-pool, resourcet, temporary, text
···
mkDerivation {
pname = "persistent-sqlite";
-
version = "2.8.1";
-
sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d";
+
version = "2.8.1.2";
+
sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"pipes_4_3_8" = callPackage
+
({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+
, optparse-applicative, QuickCheck, semigroups, test-framework
+
, test-framework-quickcheck2, transformers, void
+
}:
+
mkDerivation {
+
pname = "pipes";
+
version = "4.3.8";
+
sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi";
+
libraryHaskellDepends = [
+
base exceptions mmorph mtl semigroups transformers void
+
];
+
testHaskellDepends = [
+
base mtl QuickCheck test-framework test-framework-quickcheck2
+
transformers
+
];
+
benchmarkHaskellDepends = [
+
base criterion mtl optparse-applicative transformers
+
];
+
description = "Compositional pipelines";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"pipes-aeson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
, pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
···
pname = "plan-b";
version = "0.2.1";
sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv";
-
revision = "1";
-
editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh";
+
revision = "2";
+
editedCabalFile = "03vi68kp16lcly2rv6nq5a64k00hd4a5zvdf8pbz76450fik2c1j";
libraryHaskellDepends = [
base exceptions path path-io transformers
···
mkDerivation {
pname = "potoki";
-
version = "0.8";
-
sha256 = "00nsnbrwm62cxkx90ihdzzd8210rchgmqqcxfs90srs1awvgfd1w";
+
version = "0.9";
+
sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring directory foldl hashable
potoki-core profunctors text unagi-chan unordered-containers vector
···
attoparsec QuickCheck quickcheck-instances random rerebase tasty
tasty-hunit tasty-quickcheck
-
homepage = "https://github.com/nikita-volkov/potoki";
+
homepage = "https://github.com/metrix-ai/potoki";
description = "Simple streaming in IO";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
···
mkDerivation {
pname = "potoki-cereal";
-
version = "0.1.3";
-
sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx";
+
version = "0.1.4";
+
sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s";
libraryHaskellDepends = [
base base-prelude bytestring cereal potoki potoki-core text
-
homepage = "https://github.com/nikita-volkov/potoki-cereal";
+
homepage = "https://github.com/metrix-ai/potoki-cereal";
description = "Streaming serialization";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
···
mkDerivation {
pname = "potoki-core";
-
version = "1.5";
-
sha256 = "09fla5dc12pc668pxmkgp9988s1nq6cliy3kqqcwv969m6ws3imr";
+
version = "1.5.1";
+
sha256 = "1c357c5a34k9nd3wjyg246kcc4lfwrrfl01pki2ksdidw9xwclij";
libraryHaskellDepends = [ base profunctors stm ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
tasty-quickcheck
-
homepage = "https://github.com/nikita-volkov/potoki-core";
+
homepage = "https://github.com/metrix-ai/potoki-core";
description = "Low-level components of \"potoki\"";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
···
}) {};
"pragmatic-show" = callPackage
-
({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck
-
, vector-space
+
({ mkDerivation, base, containers, tasty, tasty-hunit
+
, tasty-quickcheck, vector-space
mkDerivation {
pname = "pragmatic-show";
-
version = "0.1.1.0";
-
sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6";
-
libraryHaskellDepends = [ base ];
+
version = "0.1.2.0";
+
sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7";
+
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base tasty tasty-hunit tasty-quickcheck vector-space
···
pname = "progress-reporting";
version = "1.1.0";
sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj";
+
revision = "1";
+
editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1";
libraryHaskellDepends = [ base deepseq mtl time ];
description = "Functionality for reporting function progress";
license = stdenv.lib.licenses.lgpl3;
···
mkDerivation {
pname = "propellor";
-
version = "5.3.2";
-
sha256 = "1jv4yzls8l4blnvmrrbwljx999g92gklpj52pn1r48sh40sqa7l1";
+
version = "5.3.3";
+
sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
mkDerivation {
pname = "qr-imager";
-
version = "1.0.1.5";
-
sha256 = "1csgghcv093g8hmkaxyj2vm0ym28yw37d7crj4rgk8fs8qhr5ib4";
+
version = "1.0.1.6";
+
sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn";
libraryHaskellDepends = [
aeson base bytestring cryptonite directory either haskell-qrencode
jose-jwt JuicyPixels microlens optparse-applicative process split
···
pname = "quickspec";
version = "2";
sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r";
+
revision = "1";
+
editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb";
libraryHaskellDepends = [
base constraints containers data-lens-light dlist QuickCheck random
reflection template-haskell transformers twee-lib uglymemo
···
pname = "regex-tdfa";
version = "1.2.2";
sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
+
revision = "1";
+
editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn";
libraryHaskellDepends = [
array base bytestring containers ghc-prim mtl parsec regex-base
···
pname = "resolv";
version = "0.1.1.1";
sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
+
revision = "1";
+
editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"retry_0_7_6_1" = callPackage
+
({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+
, hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
+
, tasty-hunit, time, transformers
+
}:
+
mkDerivation {
+
pname = "retry";
+
version = "0.7.6.1";
+
sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82";
+
libraryHaskellDepends = [
+
base data-default-class exceptions ghc-prim random transformers
+
];
+
testHaskellDepends = [
+
base data-default-class exceptions ghc-prim hedgehog HUnit mtl
+
random stm tasty tasty-hedgehog tasty-hunit time transformers
+
];
+
homepage = "http://github.com/Soostone/retry";
+
description = "Retry combinators for monadic actions that may fail";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"retryer" = callPackage
({ mkDerivation, base, optparse-applicative, process }:
mkDerivation {
···
pname = "safe-exceptions";
version = "0.1.7.0";
sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
+
revision = "1";
+
editedCabalFile = "12rv8mjrchpx9xaw87ph1hccr5hs6mb0g1imxjr8adw45prnvrw4";
libraryHaskellDepends = [ base deepseq exceptions transformers ];
testHaskellDepends = [ base hspec void ];
homepage = "https://github.com/fpco/safe-exceptions#readme";
···
mkDerivation {
pname = "scuttlebutt-types";
-
version = "0.3.0";
-
sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm";
+
version = "0.4.0";
+
sha256 = "17srdak7xbwwagm3mv7wyqff27yi217a6pjkzl2gz3n5z3h210ri";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptonite ed25519 memory
text vector
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"securemem_0_1_10" = callPackage
+
({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }:
+
mkDerivation {
+
pname = "securemem";
+
version = "0.1.10";
+
sha256 = "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j";
+
libraryHaskellDepends = [
+
base byteable bytestring ghc-prim memory
+
];
+
homepage = "https://github.com/vincenthz/hs-securemem";
+
description = "abstraction to an auto scrubbing and const time eq, memory chunk";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"sednaDBXML" = callPackage
({ mkDerivation, base, bindings-DSL, bytestring, containers
, iteratee, mtl, sedna, text
···
pname = "selda";
version = "0.1.12";
sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9";
+
revision = "1";
+
editedCabalFile = "06j1yv9w46nm5hrs15na1bisv63kkscifq01c8qq66li4vm79l8z";
libraryHaskellDepends = [
base bytestring exceptions hashable mtl psqueues text time
unordered-containers
···
license = stdenv.lib.licenses.mit;
}) {};
+
"selda_0_1_12_1" = callPackage
+
({ mkDerivation, base, bytestring, exceptions, hashable, mtl
+
, psqueues, text, time, unordered-containers
+
}:
+
mkDerivation {
+
pname = "selda";
+
version = "0.1.12.1";
+
sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9";
+
libraryHaskellDepends = [
+
base bytestring exceptions hashable mtl psqueues text time
+
unordered-containers
+
];
+
homepage = "https://selda.link";
+
description = "Multi-backend, high-level EDSL for interacting with SQL databases";
+
license = stdenv.lib.licenses.mit;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"selda-postgresql" = callPackage
({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
, selda, text
···
pname = "selda-postgresql";
version = "0.1.7.1";
sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22";
+
revision = "1";
+
editedCabalFile = "0nkhzbkvhfcp9nsq6w45ag2l7w848iw7hfllfian16vfhqc4qpld";
libraryHaskellDepends = [
base bytestring exceptions postgresql-libpq selda text
···
license = stdenv.lib.licenses.mit;
}) {};
+
"selda-postgresql_0_1_7_2" = callPackage
+
({ mkDerivation, base, bytestring, exceptions, postgresql-libpq
+
, selda, text
+
}:
+
mkDerivation {
+
pname = "selda-postgresql";
+
version = "0.1.7.2";
+
sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z";
+
libraryHaskellDepends = [
+
base bytestring exceptions postgresql-libpq selda text
+
];
+
homepage = "https://github.com/valderman/selda";
+
description = "PostgreSQL backend for the Selda database EDSL";
+
license = stdenv.lib.licenses.mit;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"selda-sqlite" = callPackage
({ mkDerivation, base, direct-sqlite, directory, exceptions, selda
, text
···
pname = "selda-sqlite";
version = "0.1.6.0";
sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6";
+
revision = "1";
+
editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1";
libraryHaskellDepends = [
base direct-sqlite directory exceptions selda text
···
license = stdenv.lib.licenses.bsd3;
}) {};
-
"servant-checked-exceptions_1_0_0_0" = callPackage
+
"servant-checked-exceptions_1_1_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
, hspec-wai, http-media, http-types, profunctors, servant
-
, servant-client, servant-docs, servant-server, tagged, tasty
-
, tasty-hspec, tasty-hunit, text, wai
+
, servant-client, servant-client-core, servant-docs, servant-server
+
, tagged, tasty, tasty-hspec, tasty-hunit, text, wai
mkDerivation {
pname = "servant-checked-exceptions";
-
version = "1.0.0.0";
-
sha256 = "1kdjhjgk9m6giygvpd2b79qs08phjy72q2bh07f7wxkiwjbkq1k6";
+
version = "1.1.0.0";
+
sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring deepseq http-media http-types profunctors
-
servant servant-client servant-docs servant-server tagged text wai
+
servant servant-client servant-client-core servant-docs
+
servant-server tagged text wai
testHaskellDepends = [
base bytestring doctest Glob hspec-wai http-types servant
···
description = "Servant combinators to facilitate writing GitHub webhooks";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
-
broken = true;
-
}) {github-webhooks = null;};
+
}) {};
"servant-haxl-client" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
···
"shake-ats" = callPackage
({ mkDerivation, base, binary, dependency, directory, hs2ats
-
, language-ats, lens, shake, shake-ext, text
+
, language-ats, microlens, shake, shake-ext, text
mkDerivation {
pname = "shake-ats";
-
version = "1.5.0.4";
-
sha256 = "19fhbwrxw5adma9d20l2wnmfcanjc7j14jyvh9c33h8scwiypjaa";
+
version = "1.5.0.6";
+
sha256 = "166i9v8d4fdbmriakndwkjgx10c4rags141ky0nw6x2ydziyn7n0";
libraryHaskellDepends = [
-
base binary dependency directory hs2ats language-ats lens shake
-
shake-ext text
+
base binary dependency directory hs2ats language-ats microlens
+
shake shake-ext text
homepage = "https://github.com/vmchale/shake-ats#readme";
description = "Utilities for building ATS projects with shake";
···
}) {};
"shake-ext" = callPackage
-
({ mkDerivation, base, Cabal, directory, mtl, shake
-
, template-haskell, text
+
({ mkDerivation, base, Cabal, composition-prelude, directory, mtl
+
, shake, template-haskell, text
mkDerivation {
pname = "shake-ext";
-
version = "2.5.0.0";
-
sha256 = "0bsl49x7y1mif4h3yp4k8p5n39d410nm0awxdpiwvan9pnz692df";
+
version = "2.7.0.0";
+
sha256 = "1jv5hcmv29ynr5asc4mpz4kh4ip5gd16b8h5qlcfac2f7m7njbwl";
libraryHaskellDepends = [
-
base Cabal directory mtl shake template-haskell text
+
base Cabal composition-prelude directory mtl shake template-haskell
+
text
homepage = "https://hub.darcs.net/vmchale/shake-ext";
description = "Helper functions for linting with shake";
···
pname = "show-combinators";
version = "0.1.0.0";
sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12";
+
revision = "1";
+
editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
homepage = "https://github.com/Lysxia/show-combinators#readme";
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"show-prettyprint_0_2_0_2" = callPackage
+
({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
+
, trifecta
+
}:
+
mkDerivation {
+
pname = "show-prettyprint";
+
version = "0.2.0.2";
+
sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg";
+
libraryHaskellDepends = [
+
ansi-wl-pprint base prettyprinter trifecta
+
];
+
testHaskellDepends = [ base doctest ];
+
homepage = "https://github.com/quchen/show-prettyprint#readme";
+
description = "Robust prettyprinter for output of auto-generated Show instances";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"show-type" = callPackage
({ mkDerivation, base }:
mkDerivation {
···
pname = "slug";
version = "0.1.7";
sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
+
revision = "1";
+
editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6";
libraryHaskellDepends = [
aeson base exceptions http-api-data path-pieces persistent
QuickCheck text
···
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+
"smcdel" = callPackage
+
({ mkDerivation, alex, ansi-terminal, array, base, containers
+
, criterion, cudd, directory, file-embed, filepath, graphviz, happy
+
, HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty
+
, tagged, template-haskell, temporary, text, time
+
}:
+
mkDerivation {
+
pname = "smcdel";
+
version = "1.0.0";
+
sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f";
+
isLibrary = true;
+
isExecutable = true;
+
libraryHaskellDepends = [
+
array base containers cudd graphviz HasCacBDD lens process
+
QuickCheck tagged temporary text time
+
];
+
executableHaskellDepends = [
+
ansi-terminal base directory file-embed filepath HasCacBDD
+
js-jquery process scotty template-haskell text
+
];
+
executableToolDepends = [ alex happy ];
+
testHaskellDepends = [ base containers hspec QuickCheck ];
+
benchmarkHaskellDepends = [ base containers criterion time ];
+
homepage = "https://github.com/jrclogic/SMCDEL";
+
description = "Symbolic Model Checking for Dynamic Epistemic Logic";
+
license = stdenv.lib.licenses.gpl2;
+
}) {};
+
"sme" = callPackage
({ mkDerivation, base }:
mkDerivation {
···
"sparkle" = callPackage
({ mkDerivation, base, binary, bytestring, Cabal, choice
, constraints, distributed-closure, filepath, inline-java, jni, jvm
-
, jvm-streaming, process, regex-tdfa, singletons, streaming, text
-
, vector, zip-archive
+
, jvm-streaming, process, regex-tdfa, singletons, streaming
+
, temporary, text, unix, vector, zip-archive
mkDerivation {
pname = "sparkle";
-
version = "0.7.3";
-
sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b";
+
version = "0.7.4";
+
sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q";
isLibrary = true;
isExecutable = true;
-
enableSeparateDataOutput = true;
-
setupHaskellDepends = [ base Cabal inline-java ];
+
setupHaskellDepends = [ base Cabal inline-java jvm-streaming ];
libraryHaskellDepends = [
base binary bytestring choice constraints distributed-closure
inline-java jni jvm jvm-streaming singletons streaming text vector
executableHaskellDepends = [
-
base bytestring filepath process regex-tdfa text zip-archive
+
base bytestring filepath process regex-tdfa temporary text unix
+
zip-archive
homepage = "http://github.com/tweag/sparkle#readme";
description = "Distributed Apache Spark applications in Haskell";
···
license = stdenv.lib.licenses.mit;
}) {};
-
"stratosphere_0_16_0" = callPackage
+
"stratosphere_0_17_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
mkDerivation {
pname = "stratosphere";
-
version = "0.16.0";
-
sha256 = "0rdgp362g0i56kgia8gc9had6mpsh33gal2zscnqapv0nk00hgbs";
+
version = "0.17.0";
+
sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"tagsoup_0_14_6" = callPackage
+
({ mkDerivation, base, bytestring, containers, deepseq, directory
+
, process, QuickCheck, text, time
+
}:
+
mkDerivation {
+
pname = "tagsoup";
+
version = "0.14.6";
+
sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb";
+
libraryHaskellDepends = [ base bytestring containers text ];
+
testHaskellDepends = [
+
base bytestring deepseq directory process QuickCheck time
+
];
+
homepage = "https://github.com/ndmitchell/tagsoup#readme";
+
description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"tagsoup-ht" = callPackage
({ mkDerivation, base, bytestring, containers, data-accessor
, explicit-exception, old-time, tagsoup, transformers, utility-ht
···
license = stdenv.lib.licenses.mit;
}) {};
-
"tasty-discover_4_1_4" = callPackage
+
"tasty-discover_4_1_5" = callPackage
({ mkDerivation, base, containers, directory, filepath, Glob
, hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
, tasty-quickcheck, tasty-smallcheck
mkDerivation {
pname = "tasty-discover";
-
version = "4.1.4";
-
sha256 = "1785i3jqc7qkc021zk6yzvkkbpm66s6b4mhyfsyasm2sslpgvwp2";
+
version = "4.1.5";
+
sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
-
"time_1_9" = callPackage
+
"time_1_9_1" = callPackage
({ mkDerivation, base, deepseq, QuickCheck, random, tasty
, tasty-hunit, tasty-quickcheck, unix
mkDerivation {
pname = "time";
-
version = "1.9";
-
sha256 = "13nfiwsh1bq4w9rwmqm1iy9kxwrqbi82qpqlpcd02ywklh21silx";
+
version = "1.9.1";
+
sha256 = "1nsvkxfm4gvmsmwd88ybpbpbny99b9k9z1f5cdkwlghvr0amg7s7";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [
base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
···
mkDerivation {
pname = "twee";
-
version = "2.1.2";
-
sha256 = "0i57wva87yh31j0wp3a041jskn3panjy6lh97013d251rcrll8jf";
+
version = "2.1.3";
+
sha256 = "08grsv9x9a289lh5w9vx401zshs6fa31756mdzmac0w9nk92229k";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
···
mkDerivation {
pname = "twee-lib";
-
version = "2.1.2";
-
sha256 = "0mvyzssazd8dggsdq8qpqn3l94970wvshxz99bhyifyfasabwm5h";
+
version = "2.1.3";
+
sha256 = "0yp6qdm189jhapx9y80yq9r97bv2v2w3n7q070i7hzczmg55rjqi";
libraryHaskellDepends = [
base containers dlist ghc-prim pretty primitive transformers vector
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"unix-time_0_3_8" = callPackage
+
({ mkDerivation, base, binary, bytestring, doctest, hspec
+
, old-locale, old-time, QuickCheck, time
+
}:
+
mkDerivation {
+
pname = "unix-time";
+
version = "0.3.8";
+
sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw";
+
libraryHaskellDepends = [ base binary bytestring old-time ];
+
testHaskellDepends = [
+
base bytestring doctest hspec old-locale old-time QuickCheck time
+
];
+
description = "Unix time parser/formatter and utilities";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"unjson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
, free, hashable, HUnit, invariant, pretty, primitive, scientific
···
pname = "unliftio-core";
version = "0.1.1.0";
sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
+
revision = "1";
+
editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
libraryHaskellDepends = [ base transformers ];
homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme";
description = "The MonadUnliftIO typeclass for unlifting monads to IO";
···
homepage = "https://github.com/Soostone/uri-bytestring";
description = "Haskell URI parsing as ByteStrings";
license = stdenv.lib.licenses.bsd3;
+
}) {};
+
+
"uri-bytestring_0_3_1_1" = callPackage
+
({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+
, bytestring, containers, criterion, deepseq, deepseq-generics
+
, fail, generics-sop, HUnit, network-uri, QuickCheck
+
, quickcheck-instances, semigroups, tasty, tasty-hunit
+
, tasty-quickcheck, template-haskell, th-lift-instances
+
, transformers
+
}:
+
mkDerivation {
+
pname = "uri-bytestring";
+
version = "0.3.1.1";
+
sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z";
+
libraryHaskellDepends = [
+
attoparsec base blaze-builder bytestring containers fail
+
template-haskell th-lift-instances
+
];
+
testHaskellDepends = [
+
attoparsec base base-compat blaze-builder bytestring containers
+
generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+
tasty-hunit tasty-quickcheck transformers
+
];
+
benchmarkHaskellDepends = [
+
base blaze-builder bytestring criterion deepseq deepseq-generics
+
network-uri
+
];
+
homepage = "https://github.com/Soostone/uri-bytestring";
+
description = "Haskell URI parsing as ByteStrings";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"uri-bytestring-aeson" = callPackage
···
license = stdenv.lib.licenses.bsd3;
}) {};
+
"validation_1" = callPackage
+
({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
+
, semigroupoids, semigroups
+
}:
+
mkDerivation {
+
pname = "validation";
+
version = "1";
+
sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh";
+
libraryHaskellDepends = [
+
base bifunctors deepseq lens semigroupoids semigroups
+
];
+
testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
+
homepage = "https://github.com/qfpl/validation";
+
description = "A data-type like Either but with an accumulating Applicative";
+
license = stdenv.lib.licenses.bsd3;
+
hydraPlatforms = stdenv.lib.platforms.none;
+
}) {};
+
"validations" = callPackage
({ mkDerivation, base, containers, digestive-functors, HUnit, mtl
, QuickCheck, test-framework, test-framework-hunit
···
mkDerivation {
pname = "wrecker-ui";
-
version = "3.1.1.0";
-
sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh";
+
version = "3.3.1.0";
+
sha256 = "08xlf26c45nir84ayss6zsjimabwa17yk55hzrdl1li9448wq89p";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
···
mkDerivation {
pname = "xmlbf";
-
version = "0.2";
-
sha256 = "1jzh5xz4l3va58mqz11bh5ysavlr17jh7qd74qcqbmz2bsfav136";
+
version = "0.3";
+
sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb";
libraryHaskellDepends = [
base bytestring containers text transformers unordered-containers
···
mkDerivation {
pname = "xmlbf-xeno";
-
version = "0.1";
-
sha256 = "0xg7v4jqrh2qnnh6cxqlaaq6ss0vav7182gm92bm6lw0pb9mj5lq";
+
version = "0.1.1";
+
sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c";
libraryHaskellDepends = [
base bytestring html-entities text unordered-containers xeno xmlbf
···
mkDerivation {
pname = "xmlbf-xmlhtml";
-
version = "0.1";
-
sha256 = "1f8q83jy45nqxmwmw6i47dq3v350cdlrz6c8w6r7dgsczgyda6vd";
+
version = "0.1.1";
+
sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4";
libraryHaskellDepends = [
base bytestring html-entities text unordered-containers xmlbf
xmlhtml
···
mkDerivation {
pname = "xmonad-vanessa";
-
version = "0.1.1.6";
-
sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq";
+
version = "0.1.1.8";
+
sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
···
mkDerivation {
pname = "yesod-markdown";
-
version = "0.12.0";
-
sha256 = "0hqpshgjx3agci4wxgzi6v3s8y0q5d4x18gkqlf204a3fynm0fmh";
+
version = "0.12.2";
+
sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare text xss-sanitize yesod-core yesod-form
···
pname = "zip";
version = "0.2.0";
sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr";
-
revision = "1";
-
editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb";
+
revision = "2";
+
editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj";
libraryHaskellDepends = [
base bytestring bzlib-conduit case-insensitive cereal conduit
conduit-extra containers digest exceptions filepath monad-control
···
pname = "zip";
version = "1.0.0";
sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9";
+
revision = "1";
+
editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn";
libraryHaskellDepends = [
base bytestring bzlib-conduit case-insensitive cereal conduit
conduit-extra containers digest directory dlist exceptions filepath
+14 -10
pkgs/development/haskell-modules/make-package-set.nix
···
callHackage = name: version: self.callPackage (self.hackage2nix name version);
# Creates a Haskell package from a source package by calling cabal2nix on the source.
-
callCabal2nix = name: src: args:
-
overrideCabal (self.callPackage (haskellSrc2nix {
+
callCabal2nix = name: src: args: let
+
filter = path: type:
+
pkgs.lib.hasSuffix "${name}.cabal" path ||
+
baseNameOf path == "package.yaml";
+
expr = haskellSrc2nix {
inherit name;
-
src =
-
let filter = path: type:
-
pkgs.lib.hasSuffix "${name}.cabal" path ||
-
baseNameOf path == "package.yaml";
-
in if pkgs.lib.canCleanSource src
-
then pkgs.lib.cleanSourceWith { inherit src filter; }
-
else src;
-
}) args) (_: { inherit src; });
+
src = if pkgs.lib.canCleanSource src
+
then pkgs.lib.cleanSourceWith { inherit src filter; }
+
else src;
+
};
+
in overrideCabal (self.callPackage expr args) (orig: {
+
inherit src;
+
preConfigure =
+
"# Generated from ${expr}\n${orig.preConfigure or ""}";
+
});
# : { root : Path
# , source-overrides : Defaulted (Either Path VersionNumber)
+2 -2
pkgs/development/interpreters/elixir/1.6.nix
···
{ mkDerivation }:
mkDerivation rec {
-
version = "1.6.0";
-
sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx";
+
version = "1.6.2";
+
sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7";
minimumOTPVersion = "18";
}
+2 -2
pkgs/development/interpreters/jruby/default.nix
···
jruby = stdenv.mkDerivation rec {
name = "jruby-${version}";
-
version = "9.1.13.0";
+
version = "9.1.16.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-
sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx";
+
sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r";
};
buildInputs = [ makeWrapper ];
+2 -2
pkgs/development/interpreters/php/default.nix
···
};
php72 = generic {
-
version = "7.2.2";
-
sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq";
+
version = "7.2.3";
+
sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa";
};
}
+4 -1
pkgs/development/libraries/glib-networking/default.nix
···
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
-
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
+
configureFlags = if stdenv.isDarwin then "--without-ca-certificates"
+
else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
+
+
LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
preBuild = ''
sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
+9 -3
pkgs/development/libraries/gstreamer/bad/default.nix
···
a real live maintainer, or some actual wide use.
'';
license = licenses.lgpl2Plus;
-
platforms = platforms.linux;
+
platforms = platforms.linux ++ platforms.darwin;
};
+
+
# TODO: Fix Cocoa build. The problem was ARC, which might be related to too
+
# old version of Apple SDK's.
+
configureFlags = optional stdenv.isDarwin "--disable-cocoa";
patchPhase = ''
sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/*
···
openjpeg libopus librsvg
fluidsynth libvdpau
libwebp xvidcore gnutls mesa
-
mjpegtools libgme openssl x265 libxml2
+
libgme openssl x265 libxml2
]
++ libintlOrEmpty
++ optional faacSupport faac
···
++ optional stdenv.isLinux wayland
# wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin
-
++ optional (!stdenv.isDarwin) wildmidi;
+
++ optional (!stdenv.isDarwin) wildmidi
+
# TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
+
++ optional (!stdenv.isDarwin) mjpegtools;
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
+2 -2
pkgs/development/libraries/gstreamer/ugly/default.nix
···
{ stdenv, fetchurl, pkgconfig, python
, gst-plugins-base, orc
, a52dec, libcdio, libdvdread
-
, lame, libmad, libmpeg2, x264, libintlOrEmpty
+
, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123
}:
stdenv.mkDerivation rec {
···
buildInputs = [
gst-plugins-base orc
a52dec libcdio libdvdread
-
lame libmad libmpeg2 x264
+
lame libmad libmpeg2 x264 mpg123
] ++ libintlOrEmpty;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+57 -1
pkgs/development/libraries/hunspell/dictionaries.nix
···
/* hunspell dictionaries */
-
{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }:
+
{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
let
···
longDescription = longDescription;
license = licenses.gpl2;
maintainers = with maintainers; [ zalakain ];
+
platforms = platforms.all;
+
};
+
};
+
+
mkDictFromJ3e =
+
{ shortName, shortDescription, dictFileName }:
+
stdenv.mkDerivation rec {
+
name = "hunspell-dict-${shortName}-j3e-${version}";
+
version = "20161207";
+
+
src = fetchurl {
+
url = "https://j3e.de/ispell/igerman98/dict/igerman98-${version}.tar.bz2";
+
sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p";
+
};
+
+
buildInputs = [ ispell perl hunspell ];
+
+
phases = ["unpackPhase" "installPhase"];
+
installPhase = ''
+
patchShebangs bin
+
make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic
+
# hunspell dicts
+
install -dm755 "$out/share/hunspell"
+
install -m644 hunspell/${dictFileName}.dic "$out/share/hunspell/"
+
install -m644 hunspell/${dictFileName}.aff "$out/share/hunspell/"
+
# myspell dicts symlinks
+
install -dm755 "$out/share/myspell/dicts"
+
ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/"
+
ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
+
'';
+
+
meta = with stdenv.lib; {
+
homepage = https://www.j3e.de/ispell/igerman98/index_en.html;
+
description = shortDescription;
+
license = with licenses; [ gpl2 gpl3 ];
+
maintainers = with maintainers; [ timor ];
platforms = platforms.all;
};
};
···
sha256 = "0lw193jr7ldvln5x5z9p21rz1by46h0say9whfcw2kxs9vprd5b3";
})
];
+
};
+
+
/* GERMAN */
+
+
de-de = mkDictFromJ3e {
+
shortName = "de-de";
+
shortDescription = "German (Germany)";
+
dictFileName = "de_DE";
+
};
+
+
de-at = mkDictFromJ3e {
+
shortName = "de-at";
+
shortDescription = "German (Austria)";
+
dictFileName = "de_AT";
+
};
+
+
de-ch = mkDictFromJ3e {
+
shortName = "de-ch";
+
shortDescription = "German (Switzerland)";
+
dictFileName = "de_CH";
};
}
+3 -3
pkgs/development/libraries/libbap/default.nix
···
stdenv.mkDerivation rec {
name = "libbap-${version}";
-
version = "master-2017-02-08";
+
version = "master-2018-03-01";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-bindings";
-
rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108";
-
sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb";
+
rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4";
+
sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v";
};
nativeBuildInputs = [ autoreconfHook which ];
+2 -2
pkgs/development/libraries/libbson/default.nix
···
stdenv.mkDerivation rec {
name = "libbson-${version}";
-
version = "1.8.0";
+
version = "1.9.2";
src = fetchFromGitHub {
owner = "mongodb";
repo = "libbson";
rev = version;
-
sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg";
+
sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck";
};
nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/libebur128/default.nix
···
{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
stdenv.mkDerivation rec {
-
version = "1.0.2";
+
version = "1.2.4";
name = "libebur128-${version}";
src = fetchFromGitHub {
owner = "jiixyj";
repo = "libebur128";
rev = "v${version}";
-
sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm";
+
sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g";
};
nativeBuildInputs = [ pkgconfig ];
+3 -3
pkgs/development/libraries/libgphoto2/default.nix
···
owner = "gphoto";
repo = "libgphoto2";
rev = "${meta.tag}";
-
sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am";
+
sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9";
};
patches = [];
···
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
'';
-
version = "2.5.12";
-
tag = "libgphoto2-2_5_12-release";
+
version = "2.5.16";
+
tag = "libgphoto2-2_5_16-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;
+2 -15
pkgs/development/libraries/mlt/default.nix
···
stdenv.mkDerivation rec {
name = "mlt-${version}";
-
version = "6.4.1";
+
version = "6.6.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
-
sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w";
+
sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
};
-
-
patches = [
-
# fix for glibc-2.26
-
(fetchurl {
-
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
-
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
-
})
-
# fix for glibc-2.26
-
(fetchurl {
-
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
-
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
-
})
-
];
buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
+7 -17
pkgs/development/libraries/mlt/qt-5.nix
···
-
{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
+
{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
, fftw, vid-stab, opencv3, ladspa-sdk
}:
···
stdenv.mkDerivation rec {
name = "mlt-${version}";
-
version = "6.4.1";
+
version = "6.6.0";
-
src = fetchurl {
-
url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
-
sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47";
+
src = fetchFromGitHub {
+
owner = "mltframework";
+
repo = "mlt";
+
rev = "v${version}";
+
sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
};
-
patches = [
-
# fix for glibc-2.26
-
(fetchurl {
-
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
-
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
-
})
-
# fix for glibc-2.26
-
(fetchurl {
-
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
-
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
-
})
-
];
buildInputs = [
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
+2 -2
pkgs/development/libraries/msilbc/default.nix
···
{ stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }:
stdenv.mkDerivation rec {
-
name = "msilbc-2.0.3";
+
name = "msilbc-2.1.2";
src = fetchurl {
url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz";
-
sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d";
+
sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp";
};
propagatedBuildInputs = [ ilbc mediastreamer ];
+2 -2
pkgs/development/libraries/opendht/default.nix
···
stdenv.mkDerivation rec {
name = "opendht-${version}";
-
version = "1.3.4";
+
version = "1.5.0";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "${version}";
-
sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8";
+
sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05";
};
buildInputs = [
+10 -9
pkgs/development/libraries/range-v3/default.nix
···
-
{ stdenv, fetchFromGitHub }:
+
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "range-v3-${version}";
-
version = "2017-01-30";
+
version = "0.3.5";
src = fetchFromGitHub {
owner = "ericniebler";
repo = "range-v3";
-
rev = "bab29767cce120e11872d79a2537bc6f0be76963";
-
sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi";
+
rev = version;
+
sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp";
};
-
dontBuild = true;
-
installPhase = ''
-
mkdir -p $out/include
-
mv include/ $out/
-
'';
+
nativeBuildInputs = [ cmake ];
+
+
doCheck = true;
+
checkTarget = "test";
+
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Experimental range library for C++11/14/17";
+2 -2
pkgs/development/libraries/rdkafka/default.nix
···
stdenv.mkDerivation rec {
name = "rdkafka-${version}";
-
version = "0.9.5";
+
version = "0.11.3";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
-
sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn";
+
sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14";
};
nativeBuildInputs = [ pkgconfig ];
+2 -2
pkgs/development/misc/avr/binutils/default.nix
···
{ stdenv, fetchurl }:
let
-
version = "2.26";
+
version = "2.30";
in
stdenv.mkDerivation {
name = "avr-binutils-${version}";
src = fetchurl {
url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
-
sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62";
+
sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg";
};
configureFlags = "--target=avr --enable-languages=c,c++";
+10 -11
pkgs/development/ocaml-modules/bap/default.nix
···
-
{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}:
+
{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis,
+
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
+
utop,
+
which, makeWrapper, writeText, ocaml}:
buildOcaml rec {
name = "bap";
-
version = "1.2.0";
+
version = "1.4.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap";
rev = "v${version}";
-
sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw";
+
sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g";
};
sigs = fetchurl {
url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
-
sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn";
+
sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19";
};
createFindlibDestdir = true;
···
llvm_38
utop ];
-
propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi
+
propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
piqi-ocaml uuidm frontc ounit ];
installPhase = ''
···
disableIda = "--disable-ida --disable-fsi-benchmark";
-
doCheck = true;
-
-
checkTarget = "check test";
-
-
configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
+
configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config";
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";
···
homepage = https://github.com/BinaryAnalysisPlatform/bap/;
maintainers = [ maintainers.maurer ];
license = licenses.mit;
-
broken = versionAtLeast ocaml.version "4.03";
+
broken = versionOlder ocaml.version "4.03";
};
}
+3 -3
pkgs/development/python-modules/bap/default.nix
···
buildPythonPackage rec {
pname = "bap";
-
version = "1.1.0";
+
version = "1.3.1";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-python";
-
rev = "v${version}";
-
sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3";
+
rev = "${version}";
+
sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
};
propagatedBuildInputs = [bap requests];
+20
pkgs/development/python-modules/pymetar/default.nix
···
+
{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+
+
buildPythonPackage rec {
+
pname = "pymetar";
+
version = "0.21";
+
+
disabled = isPy3k;
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
+
};
+
+
meta = with stdenv.lib; {
+
description = "A command-line tool to show the weather report by a given station ID";
+
homepage = http://www.schwarzvogel.de/software/pymetar.html;
+
license = licenses.gpl2;
+
maintainers = with maintainers; [ erosennin ];
+
};
+
}
+2 -2
pkgs/development/tools/ammonite/default.nix
···
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ammonite-${version}";
-
version = "1.0.3";
+
version = "1.0.5";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-
sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm";
+
sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l";
};
propagatedBuildInputs = [ jre ] ;
+2 -2
pkgs/development/tools/documentation/mkdocs/default.nix
···
buildPythonApplication rec {
pname = "mkdocs";
-
version = "0.16.3";
+
version = "0.17.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "mkdocs";
repo = "mkdocs";
rev = version;
-
sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs";
+
sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772";
};
checkInputs = [
+3 -3
pkgs/development/tools/flyway/default.nix
···
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
-
version = "4.2.0";
+
version = "5.0.7";
in
stdenv.mkDerivation {
name = "flyway-${version}";
src = fetchurl {
-
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz";
-
sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661";
+
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz";
+
sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv";
};
buildInputs = [ makeWrapper ];
dontBuild = true;
+3 -4
pkgs/development/tools/misc/msitools/default.nix
···
{stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}:
stdenv.mkDerivation rec {
-
version = "0.94";
+
version = "0.97";
name = "msitools-${version}";
src = fetchurl {
-
url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz";
-
sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm";
+
url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
+
sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs";
};
nativeBuildInputs = [ pkgconfig ];
···
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
homepage = https://wiki.gnome.org/msitools;
license = [licenses.gpl2 licenses.lgpl21];
-
maintainers = [maintainers.vcunat];
platforms = platforms.unix;
};
}
+2 -2
pkgs/development/tools/ocaml/jbuilder/default.nix
···
stdenv.mkDerivation rec {
name = "jbuilder-${version}";
-
version = "1.0+beta18";
+
version = "1.0+beta17";
src = fetchFromGitHub {
owner = "ocaml";
repo = "dune";
rev = "${version}";
-
sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6";
+
sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x";
};
buildInputs = [ ocaml ];
+2 -2
pkgs/games/openspades/default.nix
···
stdenv.mkDerivation rec {
name = "openspades-${version}";
-
version = "0.1.1b";
+
version = "0.1.2";
devPakVersion = "33";
src = fetchFromGitHub {
owner = "yvt";
repo = "openspades";
rev = "v${version}";
-
sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn";
+
sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6";
};
nativeBuildInputs = [ cmake imagemagick unzip zip file ];
+3 -1
pkgs/games/xmoto/default.nix
···
buildInputs = [
chipmunk sqlite curl zlib bzip2 libjpeg libpng
-
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
+
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
lua5 ode libxdg_basedir libxml2
];
+
+
CXXFLAGS = [ "-fpermissive" ];
meta = with stdenv.lib; {
description = "Obstacled race game";
+30 -3
pkgs/misc/emulators/retroarch/cores.nix
···
d2u = stdenv.lib.replaceChars ["-"] ["_"];
-
mkLibRetroCore = ({ core, src, description, ... }@a:
+
mkLibRetroCore = ({ core, src, description, license, ... }@a:
stdenv.lib.makeOverridable stdenv.mkDerivation rec {
name = "libretro-${core}-${version}";
···
meta = with stdenv.lib; {
inherit description;
homepage = https://www.libretro.com/;
-
license = licenses.gpl3Plus;
+
inherit license;
maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
platforms = platforms.linux;
};
···
fetchSubmodules = true;
};
-
in
+
in with stdenv.lib.licenses;
{
···
sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72";
};
description = "Port of 4DO/libfreedo to libretro";
+
license = "Non-commercial";
}).override {
buildPhase = "make";
};
···
sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7";
};
description = "Port of Mednafen's PC Engine core to libretro";
+
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-pce-fast";
···
sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x";
};
description = "Port of Mednafen's PSX Engine core to libretro";
+
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-psx";
···
sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c";
};
description = "Port of Mednafen's Saturn core to libretro";
+
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-saturn";
···
sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s";
};
description = "Fork of bsnes with HLE DSP emulation restored";
+
license = gpl3;
}).override {
buildPhase = "make && cd out";
};
···
sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl";
};
description = "libretro wrapper for desmume NDS emulator";
+
license = gpl2;
}).override {
configurePhase = "cd desmume";
};
···
sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3";
};
description = "Port of Dolphin to libretro";
+
license = gpl2Plus;
extraBuildInputs = [
cmake curl mesa pcre pkgconfig sfml miniupnpc
···
sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m";
};
description = "Port of Final Burn Alpha to libretro";
+
license = "Non-commercial";
}).override {
buildPhase = ''
cd svn-current/trunk \
···
sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b";
};
description = "FCEUmm libretro port";
+
license = gpl2;
};
gambatte = mkLibRetroCore rec {
···
sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr";
};
description = "Gambatte libretro port";
+
license = gpl2;
};
genesis-plus-gx = mkLibRetroCore rec {
···
sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c";
};
description = "Enhanced Genesis Plus libretro port";
+
license = "Non-commercial";
};
mame = (mkLibRetroCore {
···
sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
};
description = "Port of MAME to libretro";
+
license = gpl2Plus;
extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ];
}).override {
···
sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7";
};
description = "Port of mGBA to libretro";
+
license = mpl20;
};
mupen64plus = (mkLibRetroCore rec {
···
sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8";
};
description = "Libretro port of Mupen64 Plus, GL only";
+
license = gpl2;
extraBuildInputs = [ mesa libpng ];
}).override {
···
sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q";
};
description = "nestopia undead libretro port";
+
license = gpl2;
}).override {
buildPhase = "cd libretro && make";
};
···
sha256 = "19396v50azrb52ifjk298zgcbxn8dvfvp6zwrnzsk6mp8ff7qcqw";
};
description = "Parallel Mupen64plus rewrite for libretro.";
+
license = gpl2;
extraBuildInputs = [ mesa libpng ];
}).override {
···
sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h";
};
description = "Fast MegaDrive/MegaCD/32X emulator";
+
license = "MAME";
extraBuildInputs = [ libpng SDL ];
}).override {
···
sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r";
};
description = "ppsspp libretro port";
+
license = gpl2;
extraBuildInputs = [ mesa ffmpeg ];
}).override {
buildPhase = "cd libretro && make";
···
sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja";
};
description = "Prboom libretro port";
+
license = gpl2;
}).override {
buildPhase = "make";
};
···
sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1";
};
description = "QuickNES libretro port";
+
license = lgpl21Plus;
}).override {
buildPhase = "make";
};
···
sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m";
};
description = "Reicast libretro port";
+
license = gpl2;
extraBuildInputs = [ mesa ];
}).override {
buildPhase = "make";
···
sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy";
};
description = "Libretro port of ScummVM";
+
license = gpl2;
extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
}).override {
buildPhase = "cd backends/platform/libretro/build && make";
···
sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip";
};
description = "Port of SNES9x git to libretro";
+
license = "Non-commercial";
}).override {
buildPhase = "cd libretro && make";
};
···
sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij";
};
description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
+
license = "Non-commercial";
}).override {
buildPhase = ''
make -f Makefile.libretro
···
sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0";
};
description = "Port of Stella to libretro";
+
license = gpl2;
}).override {
buildPhase = "make";
};
···
sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv";
};
description = "VBA-M libretro port with modifications for speed";
+
license = gpl2;
};
vba-m = (mkLibRetroCore rec {
···
sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z";
};
description = "vanilla VBA-M libretro port";
+
license = gpl2;
}).override {
buildPhase = "cd src/libretro && make";
};
+11 -3
pkgs/os-specific/darwin/khd/default.nix
···
-
{ stdenv, fetchFromGitHub, Carbon, Cocoa }:
+
{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }:
stdenv.mkDerivation rec {
name = "khd-${version}";
-
version = "2.1.1";
+
version = "3.0.0";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = "khd";
rev = "v${version}";
-
sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr";
+
sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4";
};
+
+
patches = [
+
# Fixes build issues, remove with >3.0.0
+
(fetchpatch {
+
url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch;
+
sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np";
+
})
+
];
buildInputs = [ Carbon Cocoa ];
+2 -2
pkgs/os-specific/darwin/kwm/default.nix
···
stdenv.mkDerivation rec {
name = "kwm-${version}";
-
version = "4.0.4";
+
version = "4.0.5";
src = fetchzip {
stripRoot = false;
url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip";
-
sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc";
+
sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb";
};
# TODO: Build this properly once we have swiftc.
+2 -2
pkgs/servers/mail/mlmmj/default.nix
···
stdenv.mkDerivation rec {
name = "mlmmj-${version}";
-
version = "1.2.19.0";
+
version = "1.3.0";
src = fetchurl {
url = "http://mlmmj.org/releases/${name}.tar.gz";
-
sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0";
+
sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn";
};
postInstall = ''
+5 -5
pkgs/servers/monitoring/grafana/default.nix
···
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
-
version = "4.6.3";
+
version = "5.0.0";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
···
rev = "v${version}";
owner = "grafana";
repo = "grafana";
-
sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j";
+
sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9";
};
srcStatic = fetchurl {
url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-
sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03";
+
sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
postInstall = ''
tar -xvf $srcStatic
mkdir -p $bin/share/grafana
-
mv grafana-*/{public,conf,vendor} $bin/share/grafana/
-
ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs
+
mv grafana-*/{public,conf,tools} $bin/share/grafana/
+
ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
'';
meta = with lib; {
+2 -2
pkgs/servers/monitoring/riemann/default.nix
···
stdenv.mkDerivation rec {
name = "riemann-${version}";
-
version = "0.2.12";
+
version = "0.3.0";
src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
-
sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr";
+
sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/servers/nosql/neo4j/default.nix
···
stdenv.mkDerivation rec {
name = "neo4j-${version}";
-
version = "3.1.2";
+
version = "3.3.2";
src = fetchurl {
url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-
sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40";
+
sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala";
};
buildInputs = [ makeWrapper jre8 which gawk ];
+1
pkgs/servers/sql/mysql/5.5.x.nix
···
"-DINSTALL_SHAREDIR=share/mysql"
];
+
NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
prePatch = ''
+2 -2
pkgs/servers/web-apps/searx/default.nix
···
buildPythonApplication rec {
pname = "searx";
-
version = "0.13.1";
+
version = "0.14.0";
# Can not use PyPI because certain test files are missing.
src = fetchFromGitHub {
owner = "asciimoo";
repo = "searx";
rev = "v${version}";
-
sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani";
+
sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl";
};
postPatch = ''
+2 -2
pkgs/tools/audio/abcmidi/default.nix
···
stdenv.mkDerivation rec {
name = "abcMIDI-${version}";
-
version = "2018.02.07";
+
version = "2018.02.22";
src = fetchzip {
url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-
sha256 = "16hdv114hs5agg288kpbijqw53wdiswjmprpbhy7kgdjnp9ijwxw";
+
sha256 = "03ln05012yhlq8aalm00af6pidb44phmmidlc953453isfllg82a";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase
+2 -2
pkgs/tools/filesystems/s3fs/default.nix
···
stdenv.mkDerivation rec {
name = "s3fs-fuse-${version}";
-
version = "1.82";
+
version = "1.83";
src = fetchFromGitHub {
owner = "s3fs-fuse";
repo = "s3fs-fuse";
rev = "v${version}";
-
sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10";
+
sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx";
};
buildInputs = [ curl openssl libxml2 fuse ];
+2 -2
pkgs/tools/misc/pastebinit/default.nix
···
{ stdenv, fetchurl, python3 }:
stdenv.mkDerivation rec {
-
version = "1.4.1";
+
version = "1.5";
name = "pastebinit-${version}";
src = fetchurl {
url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
-
sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2";
+
sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
};
buildInputs = [ python3 ];
+2 -2
pkgs/tools/misc/svtplay-dl/default.nix
···
inherit (pythonPackages) python nose pycrypto requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
-
version = "1.9.7";
+
version = "1.9.9";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
-
sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r";
+
sha256 = "1iam2pdcrlpcgk2hx3m7zawznp2p939xdv8cpll6sd6n0l4hpdc9";
};
pythonPaths = [ pycrypto requests ];
+4 -2
pkgs/tools/networking/dhcpcd/default.nix
···
{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
stdenv.mkDerivation rec {
-
name = "dhcpcd-7.0.1";
+
# when updating this to >=7, check, see previous reverts:
+
# nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
+
name = "dhcpcd-6.11.5";
src = fetchurl {
url = "mirror://roy/dhcpcd/${name}.tar.xz";
-
sha256 = "1j7kyg9gm5d1k6qjdscjz2rjgpqia0dxgk69lswp21y0pizm6dlb";
+
sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg";
};
nativeBuildInputs = [ pkgconfig ];
+44
pkgs/tools/networking/infiniband-diags/default.nix
···
+
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core,
+
glib, opensm, perl, makeWrapper }:
+
+
stdenv.mkDerivation rec {
+
name = "infiniband-diags-${version}";
+
version = "2.0.0";
+
+
src = fetchFromGitHub {
+
owner = "linux-rdma";
+
repo = "infiniband-diags";
+
rev = version;
+
sha256 = "06x8yy3ly1vzraznc9r8pfsal9mjavxzhgrla3q2493j5jz0sx76";
+
};
+
+
nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ];
+
+
buildInputs = [ rdma-core glib opensm perl ];
+
+
preConfigure = ''
+
export CFLAGS="-I${opensm}/include/infiniband"
+
./autogen.sh
+
'';
+
+
configureFlags = "--with-perl-installdir=\${out}/lib/perl5/site_perl --sbindir=\${out}/bin";
+
+
postInstall = ''
+
rmdir $out/var/run $out/var
+
'';
+
+
postFixup = ''
+
for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do
+
echo "wrapping $pls"
+
wrapProgram $pls --prefix PERL5LIB : "$out/lib/perl5/site_perl"
+
done
+
'';
+
+
meta = with stdenv.lib; {
+
description = "Utilities designed to help configure, debug, and maintain infiniband fabrics";
+
homepage = http://linux-rdma.org/;
+
license = licenses.bsd2; # Or GPL 2
+
maintainers = [ maintainers.aij ];
+
platforms = [ "x86_64-linux" ];
+
};
+
}
+2 -2
pkgs/tools/networking/openfortivpn/default.nix
···
with stdenv.lib;
let repo = "openfortivpn";
-
version = "1.5.0";
+
version = "1.6.0";
in stdenv.mkDerivation {
name = "${repo}-${version}";
···
owner = "adrienverge";
inherit repo;
rev = "v${version}";
-
sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86";
+
sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
+35
pkgs/tools/networking/stubby/default.nix
···
+
{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen
+
, autoreconfHook, automake, check, libbsd, libyaml, darwin }:
+
+
stdenv.mkDerivation rec {
+
pname = "stubby";
+
name = "${pname}-${version}";
+
version = "0.2.2";
+
+
src = fetchFromGitHub {
+
owner = "getdnsapi";
+
repo = pname;
+
rev = "v${version}";
+
sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8";
+
};
+
+
nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ];
+
+
buildInputs = [ doxygen getdns automake file check ]
+
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
+
+
meta = with stdenv.lib; {
+
description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
+
longDescription = ''
+
Stubby is an application that acts as a local DNS Privacy stub
+
resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS
+
queries sent from a client machine (desktop or laptop) to a DNS
+
Privacy resolver increasing end user privacy. Stubby is developed by
+
the getdns team.
+
'';
+
homepage = https://dnsprivacy.org/wiki/x/JYAT;
+
downloadPage = "https://github.com/getdnsapi/stubby";
+
maintainers = with maintainers; [ leenaars ];
+
license = licenses.bsd3; platforms = platforms.all;
+
};
+
}
+5
pkgs/tools/system/memtester/default.nix
···
name = "memtester-${version}";
version = "4.3.0";
+
preConfigure = ''
+
echo "$CC" > conf-cc
+
echo "$CC" > conf-ld
+
'';
+
src = fetchurl {
url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr";
+2 -2
pkgs/tools/system/nq/default.nix
···
stdenv.mkDerivation rec {
name = "nq-${version}";
-
version = "0.1";
+
version = "0.2.2";
src = fetchFromGitHub {
owner = "chneukirchen";
repo = "nq";
rev = "v${version}";
-
sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4";
+
sha256 = "0348r3j5y445psm8lj35z100cfvbfp05s7ji6bxd0gg4n66l2c4l";
};
makeFlags = "PREFIX=$(out)";
postPatch = ''
+5 -3
pkgs/tools/system/vboot_reference/default.nix
···
makeFlags = [
"DESTDIR=$(out)"
+
"HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
];
postInstall = ''
···
cp -r tests/devkeys* $out/share/vboot/
'';
-
meta = {
+
meta = with stdenv.lib; {
description = "Chrome OS partitioning and kernel signing tools";
-
license = stdenv.lib.licenses.bsd3;
-
platforms = stdenv.lib.platforms.linux;
+
license = licenses.bsd3;
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ lheckemann ];
};
}
+47
pkgs/tools/text/ispell/default.nix
···
+
{ stdenv, fetchurl, bison, ncurses }:
+
+
stdenv.mkDerivation rec {
+
name = "ispell-3.3.02";
+
src = fetchurl {
+
url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz";
+
sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
+
};
+
buildInputs = [ bison ncurses ];
+
patches = [
+
./patches/0005-Do-not-reorder-words.patch
+
./patches/0007-Use-termios.patch
+
./patches/0008-Tex-backslash.patch
+
./patches/0009-Fix-FTBFS-on-glibc.patch
+
./patches/0011-Missing-prototypes.patch
+
./patches/0012-Fix-getline.patch
+
./patches/0013-Fix-man-pages.patch
+
./patches/0021-Fix-gcc-warnings.patch
+
./patches/0023-Exclusive-options.patch
+
./patches/0024-Check-tempdir-creation.patch
+
./patches/0025-Languages.patch
+
./patches/0030-Display-whole-multibyte-character.patch
+
];
+
postPatch = ''
+
cat >> local.h <<EOF
+
#define USG
+
#define TERMLIB "-lncurses"
+
#define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}"
+
#define MASTERHASH "americanmed.hash"
+
#define BINDIR "$out/bin"
+
#define LIBDIR "$out/lib"
+
#define ELISPDIR "{$out}/share/emacs/site-lisp"
+
#define TEXINFODIR "$out/share/info"
+
#define MAN1DIR "$out/share/man/man1"
+
#define MAN4DIR "$out/share/man/man4"
+
#define MAN45DIR "$out/share/man/man5"
+
#define MINIMENU
+
#define HAS_RENAME
+
EOF
+
+
'';
+
preBuild = ''
+
for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do
+
mkdir -p $dir
+
done
+
'';
+
}
+52
pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch
···
+
From: Geoff Kuenning <geoff@cs.hmc.edu>
+
Date: Thu, 3 Nov 2005 14:14:15 -0800
+
Subject: 0005 Do not reorder words
+
+
ispell reorders words in personal dictionary without good reason.
+
+
The correct approach is to build the internal data structure with variant
+
spellings stored in the same order as they appear in the personal dictionary.
+
Fortunately, this is easy, though the patch is to a different file. This one
+
has been tested (That's what I get for trying to rush out a fix before a
+
meeting!).
+
---
+
makedent.c | 18 +++++++++++-------
+
1 files changed, 11 insertions(+), 7 deletions(-)
+
+
diff --git a/makedent.c b/makedent.c
+
index 0453d11..d121345 100644
+
--- a/makedent.c
+
+++ b/makedent.c
+
@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp)
+
if (retval == 0)
+
{
+
/*
+
- ** Couldn't combine the two entries. Add a new variant. For
+
- ** ease, we'll stick it right behind the header, rather than
+
- ** at the end of the list.
+
+ ** Couldn't combine the two entries. Add a new variant. We
+
+ ** stick it at the end of the variant list because it's
+
+ ** important to maintain order; this causes the personal
+
+ ** dictionary to have a stable ordering.
+
*/
+
forcevheader (hdrp, oldp, newp);
+
tdent = (struct dent *) mymalloc (sizeof (struct dent));
+
@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp)
+
return -1;
+
}
+
*tdent = *newp;
+
- tdent->next = hdrp->next;
+
- hdrp->next = tdent;
+
- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS);
+
- hdrp->flagfield |= MOREVARIANTS;
+
+ for (oldp = hdrp;
+
+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS;
+
+ oldp = oldp->next)
+
+ ;
+
+ tdent->next = oldp->next;
+
+ oldp->next = tdent;
+
+ oldp->flagfield |= MOREVARIANTS;
+
combineaffixes (hdrp, newp);
+
hdrp->flagfield |= (newp->flagfield & KEEP);
+
if (captype (newp->flagfield) == FOLLOWCASE)
+
--
+188
pkgs/tools/text/ispell/patches/0007-Use-termios.patch
···
+
From: Torsten Landschoff <t.landschoff@gmx.net>
+
Date: Tue, 30 Mar 1999 21:05:09 +0100
+
Subject: 0007 Use termios
+
+
Use termios instead of termio (Closes: #35288).
+
+
Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on
+
ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm
+
---
+
term.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
1 files changed, 58 insertions(+), 0 deletions(-)
+
+
diff --git a/term.c b/term.c
+
index 4923844..47c1aa0 100644
+
--- a/term.c
+
+++ b/term.c
+
@@ -87,13 +87,22 @@ static char Rcs_Id[] =
+
#include "proto.h"
+
#include "msgs.h"
+
#ifdef USG
+
+#if defined(__GLIBC__) && __GLIBC__ >= 2
+
+/* Use termios under at least glibc */
+
+ #include <termios.h>
+
+ #define USE_TERMIOS
+
+#else
+
#include <termio.h>
+
+#endif
+
#else
+
#ifndef __DJGPP__
+
#include <sgtty.h>
+
#endif
+
#endif
+
#include <signal.h>
+
+#include <unistd.h>
+
+#include <sys/types.h>
+
+#include <sys/wait.h>
+
+
void ierase P ((void));
+
void imove P ((int row, int col));
+
@@ -166,8 +175,13 @@ static int iputch (c)
+
}
+
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+static struct termios sbuf;
+
+static struct termios osbuf;
+
+#else
+
static struct termio sbuf;
+
static struct termio osbuf;
+
+#endif
+
#else
+
static struct sgttyb sbuf;
+
static struct sgttyb osbuf;
+
@@ -190,9 +204,13 @@ void terminit ()
+
int tpgrp;
+
#else
+
#ifdef TIOCGPGRP
+
+#ifdef USE_TERMIOS
+
+ pid_t tpgrp;
+
+#else
+
int tpgrp;
+
#endif
+
#endif
+
+#endif
+
#ifdef TIOCGWINSZ
+
struct winsize wsize;
+
#endif /* TIOCGWINSZ */
+
@@ -276,7 +294,11 @@ retry:
+
(void) fprintf (stderr, TERM_C_NO_BATCH);
+
exit (1);
+
}
+
+#ifdef USE_TERMIOS
+
+ (void) tcgetattr (0, &osbuf);
+
+#else
+
(void) ioctl (0, TCGETA, (char *) &osbuf);
+
+#endif
+
termchanged = 1;
+
+
sbuf = osbuf;
+
@@ -285,7 +307,11 @@ retry:
+
sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
+
sbuf.c_cc[VMIN] = 1;
+
sbuf.c_cc[VTIME] = 1;
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &sbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &sbuf);
+
+#endif
+
+
uerasechar = osbuf.c_cc[VERASE];
+
ukillchar = osbuf.c_cc[VKILL];
+
@@ -298,7 +324,11 @@ retry:
+
#endif
+
#endif
+
#ifdef TIOCGPGRP
+
+#ifdef USE_TERMIOS
+
+ if ((tpgrp = tcgetpgrp (0)) == -1)
+
+#else
+
if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0)
+
+#endif
+
{
+
(void) fprintf (stderr, TERM_C_NO_BATCH);
+
exit (1);
+
@@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo)
+
if (te)
+
tputs (te, 1, iputch);
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &osbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &osbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+
#ifdef TIOCSLTC
+
@@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo)
+
if (te)
+
tputs (te, 1, iputch);
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &osbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+
#ifdef TIOCSLTC
+
@@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo)
+
if (termchanged)
+
{
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSANOW, &sbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &sbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
+
#ifdef TIOCSLTC
+
@@ -481,7 +523,11 @@ int shellescape (buf)
+
argv[i] = NULL;
+
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &osbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &osbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+
#ifdef TIOCSLTC
+
@@ -527,7 +573,11 @@ int shellescape (buf)
+
#endif
+
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &sbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &sbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
+
#ifdef TIOCSLTC
+
@@ -563,7 +613,11 @@ void shescape (buf)
+
#endif
+
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &osbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &osbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &osbuf);
+
#ifdef TIOCSLTC
+
@@ -611,7 +665,11 @@ void shescape (buf)
+
#endif
+
+
#ifdef USG
+
+#ifdef USE_TERMIOS
+
+ (void) tcsetattr (0, TCSADRAIN, &sbuf);
+
+#else
+
(void) ioctl (0, TCSETAW, (char *) &sbuf);
+
+#endif
+
#else
+
(void) ioctl (0, TIOCSETP, (char *) &sbuf);
+
#ifdef TIOCSLTC
+
--
+48
pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch
···
+
From: Ken Stevens <kstevens@ece.utah.edu>
+
Date: Sat, 15 Jul 2000 22:10:53 -0400
+
Subject: 0008 Tex backslash
+
+
Version 3.1.20 contains an irritating bug when using latex that causes all
+
sorts of problems when the backslash is used. (The backslash is a common
+
character in latex that is used, among other things, to create a forced space
+
similar to the tilde character.) In the current version, 3.1.20, the next TWO
+
characters are skipped after a backslash. This can results in misspellings and
+
the file being incorrectly parsed. (For example, if the text contains the
+
sequence `\ $' math mode will not be entered until the matching $ which should
+
end it, resulting in the body of the text not being spell checked and the math
+
region being checked.)
+
+
Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are
+
using iso character sets.
+
+
http://www.kdstevens.com/~stevens/ispell-faq.html#bslash
+
---
+
defmt.c | 7 +++----
+
1 files changed, 3 insertions(+), 4 deletions(-)
+
+
diff --git a/defmt.c b/defmt.c
+
index 35f93e4..7499752 100644
+
--- a/defmt.c
+
+++ b/defmt.c
+
@@ -884,6 +884,8 @@ static int TeX_math_end (bufp)
+
return 0;
+
}
+
+
+/* Updates bufp to point to the next character to skip. */
+
+/* Should only be called on non-word characters. */
+
static int TeX_math_begin (bufp)
+
unsigned char ** bufp;
+
{
+
@@ -902,10 +904,7 @@ static int TeX_math_begin (bufp)
+
if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE)
+
return 1;
+
else if (!isalpha(**bufp) && **bufp != '@')
+
- {
+
- (*bufp)++;
+
- continue;
+
- }
+
+ return 0;
+
else if (TeX_strncmp (*bufp, "begin", 5) == 0)
+
{
+
if (TeX_math_check ('b', bufp))
+
--
+23
pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch
···
+
From: Richard Braakman <dark@dark.wapit.fi>
+
Date: Fri, 2 Feb 2001 17:22:53 +0200
+
Subject: 0009 Fix FTBFS on glibc
+
+
Fix FTBFS on glibc (Closes: #75377)
+
---
+
config.X | 2 +-
+
1 files changed, 1 insertions(+), 1 deletions(-)
+
+
diff --git a/config.X b/config.X
+
index 18bf621..0a47cb2 100644
+
--- a/config.X
+
+++ b/config.X
+
@@ -531,7 +531,7 @@
+
#endif /* NO_MKSTEMP */
+
+
/* Aliases for some routines */
+
-#ifdef USG
+
+#if defined (USG) && !defined(__GLIBC__)
+
#define BCOPY(s, d, n) memcpy (d, s, n)
+
#define BZERO(d, n) memset (d, 0, n)
+
#define index strchr
+
--
+84
pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch
···
+
From: Doug Porter <dsp@debian.org>
+
Date: Tue, 22 Jan 2002 10:28:44 -0500
+
Subject: 0011 Missing prototypes
+
+
Fixing implicit declarations (Closes: #130405).
+
---
+
correct.c | 1 +
+
ijoin.c | 2 +-
+
ispell.c | 2 ++
+
lookup.c | 2 ++
+
tree.c | 1 +
+
5 files changed, 7 insertions(+), 1 deletions(-)
+
+
diff --git a/correct.c b/correct.c
+
index e2b63c8..661bf57 100644
+
--- a/correct.c
+
+++ b/correct.c
+
@@ -201,6 +201,7 @@ static char Rcs_Id[] =
+
*/
+
+
#include <ctype.h>
+
+#include <unistd.h>
+
#include "config.h"
+
#include "ispell.h"
+
#include "proto.h"
+
diff --git a/ijoin.c b/ijoin.c
+
index edb18d1..5da039a 100644
+
--- a/ijoin.c
+
+++ b/ijoin.c
+
@@ -115,6 +115,7 @@ static char Rcs_Id[] =
+
*/
+
+
#include <stdio.h>
+
+#include <string.h>
+
#include "config.h"
+
#include "ispell.h"
+
#include "proto.h"
+
@@ -169,7 +170,6 @@ static char * tabchar = " \t"; /* Field separator character(s) */
+
static int unpairable1 = 0; /* NZ if -a1 */
+
static int unpairable2 = 0; /* NZ if -a2 */
+
+
-extern int strcmp ();
+
+
int main (argc, argv) /* Join files */
+
int argc; /* Argument count */
+
diff --git a/ispell.c b/ispell.c
+
index 9b509d0..59fe358 100644
+
--- a/ispell.c
+
+++ b/ispell.c
+
@@ -235,6 +235,8 @@ static char Rcs_Id[] =
+
#include <fcntl.h>
+
#endif /* NO_FCNTL_H */
+
#include <sys/stat.h>
+
+#include <ctype.h>
+
+#include <unistd.h>
+
+
static void usage P ((void));
+
int main P ((int argc, char * argv[]));
+
diff --git a/lookup.c b/lookup.c
+
index 648f9c8..8bf1f6c 100644
+
--- a/lookup.c
+
+++ b/lookup.c
+
@@ -87,6 +87,8 @@ static char Rcs_Id[] =
+
+
#include <fcntl.h>
+
+
+#include <sys/types.h>
+
+#include <unistd.h>
+
#include "config.h"
+
#include "ispell.h"
+
#include "proto.h"
+
diff --git a/tree.c b/tree.c
+
index 073a6a6..c26f635 100644
+
--- a/tree.c
+
+++ b/tree.c
+
@@ -94,6 +94,7 @@ static char Rcs_Id[] =
+
+
#include <ctype.h>
+
#include <errno.h>
+
+#include <unistd.h>
+
#include "config.h"
+
#include "ispell.h"
+
#include "proto.h"
+
--
+62
pkgs/tools/text/ispell/patches/0012-Fix-getline.patch
···
+
From: Stefan Potyra <sistpoty@ubuntu.com>
+
Date: Sat, 3 Oct 2009 04:00:34 +0200
+
Subject: 0012 Fix getline
+
+
getline is not provided by eglibc, avoid conflict
+
+
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401
+
Forwarded: no
+
---
+
correct.c | 10 +++++-----
+
1 files changed, 5 insertions(+), 5 deletions(-)
+
+
diff --git a/correct.c b/correct.c
+
index 661bf57..ff7cb99 100644
+
--- a/correct.c
+
+++ b/correct.c
+
@@ -246,7 +246,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t * pattern,
+
struct flagent * sufent,
+
ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
+
int * nsaved));
+
-static char * getline P ((char * buf, int bufsize));
+
+static char * getline_ispell P ((char * buf, int bufsize));
+
void askmode P ((void));
+
void copyout P ((unsigned char ** cc, int cnt));
+
static void lookharder P ((unsigned char * string));
+
@@ -572,7 +572,7 @@ checkagain:
+
+
imove (li - 1, 0);
+
(void) putchar ('!');
+
- if (getline ((char *) buf, sizeof buf) == NULL)
+
+ if (getline_ispell ((char *) buf, sizeof buf) == NULL)
+
{
+
(void) putchar (7);
+
ierase ();
+
@@ -597,7 +597,7 @@ checkagain:
+
(void) printf ("%s ", CORR_C_READONLY);
+
}
+
(void) printf (CORR_C_REPLACE_WITH);
+
- if (getline ((char *) ctok, ctokl) == NULL)
+
+ if (getline_ispell ((char *) ctok, ctokl) == NULL)
+
{
+
(void) putchar (7);
+
/* Put it back */
+
@@ -665,7 +665,7 @@ checkagain:
+
unsigned char buf[100];
+
imove (li - 1, 0);
+
(void) printf (CORR_C_LOOKUP_PROMPT);
+
- if (getline ((char *) buf, sizeof buf) == NULL)
+
+ if (getline_ispell ((char *) buf, sizeof buf) == NULL)
+
{
+
(void) putchar (7);
+
ierase ();
+
@@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd,
+
return;
+
}
+
+
-static char * getline (s, len)
+
+static char * getline_ispell(s, len)
+
register char * s;
+
register int len;
+
{
+
--
+227
pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch
···
+
From: David Paleino <d.paleino@gmail.com>
+
Date: Mon, 9 Nov 2009 09:22:12 +0000
+
Subject: 0013 Fix man pages
+
+
Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign
+
+
Forwarded: no
+
---
+
ispell.1X | 26 +++++++++++++-------------
+
ispell.5X | 26 +++++++++++++-------------
+
2 files changed, 26 insertions(+), 26 deletions(-)
+
+
diff --git a/ispell.1X b/ispell.1X
+
index b27b120..79894d4 100644
+
--- a/ispell.1X
+
+++ b/ispell.1X
+
@@ -236,8 +236,8 @@ count affix-file
+
.RB [ \-p | \-s]
+
.RB [ \-c ]
+
.I expanded-file
+
-.IR affix [ +addition ]
+
-...
+
+.IR affix
+
+.RI [ +addition ]
+
.PP
+
.B icombine
+
.RB [ \-T
+
@@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit.
+
If the
+
.B \-V
+
flag is given, characters that are not in the 7-bit ANSI printable
+
-character set will always be displayed in the style of "cat -v", even if
+
+character set will always be displayed in the style of "cat \-v", even if
+
.I ispell
+
thinks that these characters are legal ISO Latin-1 on your system.
+
This is useful when working with older terminals.
+
@@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file,
+
other than the default.
+
If the filename does not contain a "/",
+
the library directory for the default dictionary file is prefixed;
+
-thus, to use a dictionary in the local directory "-d ./xxx.hash" must
+
+thus, to use a dictionary in the local directory "\-d ./xxx.hash" must
+
be used.
+
This is useful to allow dictionaries for alternate languages.
+
Unlike previous versions of
+
@@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted.
+
.I Ispell
+
will typically be used with input from a file, meaning that preserving
+
parity for possible 8 bit characters from the input text is OK. If you
+
-specify the -l option, and actually type text from the terminal, this may
+
+specify the \-l option, and actually type text from the terminal, this may
+
create problems if your stty settings preserve parity.
+
.PP
+
It is not possible to use
+
@@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero).
+
The suggested derivations following the near misses are in the form:
+
.PP
+
.RS
+
-[prefix+] root [-prefix] [-suffix] [+suffix]
+
+[prefix+] root [\-prefix] [\-suffix] [+suffix]
+
.RE
+
.PP
+
(e.g., "re+fry-y+ies" to get "refries")
+
@@ -841,7 +841,7 @@ These output lines can be summarized as follows:
+
.PP
+
For example, a dummy dictionary containing the words "fray", "Frey",
+
"fry", and "refried" might produce the following response to the
+
-command "echo 'frqy refries | ispell -a -m -d ./test.hash":
+
+command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash":
+
.RS
+
.nf
+
(#) International Ispell Version 3.0.05 (beta), 08/10/91
+
@@ -1036,7 +1036,7 @@ script does this.
+
As an example, the command:
+
.PP
+
.RS
+
-echo BOTHER | ispell -c
+
+echo BOTHER | ispell \-c
+
.RE
+
.PP
+
produces:
+
@@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words.
+
For example, the command:
+
.PP
+
.RS
+
-echo BOTH/R | ispell -e
+
+echo BOTH/R | ispell \-e
+
.RE
+
.PP
+
produces:
+
@@ -1268,7 +1268,7 @@ hash file if it were added to the language table.
+
Only affixes that generate legal roots (found in the original input)
+
are listed.
+
.PP
+
-If the "-c" option is not given, the output lines are in the
+
+If the "\-c" option is not given, the output lines are in the
+
following format:
+
.IP
+
strip/add/count/bytes
+
@@ -1298,7 +1298,7 @@ If the
+
the output is made visually cleaner (but harder to post-process)
+
by changing it to:
+
.IP
+
--strip+add<tab>count<tab>bytes
+
+\-strip+add<tab>count<tab>bytes
+
.PP
+
where
+
.IR strip ,
+
@@ -1313,7 +1313,7 @@ represents the ASCII tab character.
+
The method used to generate possible affixes will also generate
+
longer affixes which have common headers or trailers. For example,
+
the two words "moth" and "mother" will generate not only the obvious
+
-substitution "+er" but also "-h+her" and "-th+ther" (and possibly
+
+substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly
+
even longer ones, depending on the value of
+
.IR min ).
+
To prevent
+
@@ -1621,7 +1621,7 @@ redirected.
+
However, a lot of the temporary space needed is for sorting, so TMPDIR
+
is only a partial help on systems with an uncooperative
+
.IR sort (1).
+
-("Cooperative" is defined as accepting the undocumented -T switch).
+
+("Cooperative" is defined as accepting the undocumented \-T switch).
+
At its peak usage,
+
.I munchlist
+
takes 10 to 40 times the original
+
diff --git a/ispell.5X b/ispell.5X
+
index ab526ed..7a1c2e5 100644
+
--- a/ispell.5X
+
+++ b/ispell.5X
+
@@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:)
+
echo qqqqq > dummy.dict
+
buildhash dummy.dict \fIaffix-file\fP dummy.hash
+
awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e
+
- | ispell -a -T \fIold-dict-string-type\fP \e
+
- -d ./dummy.hash -p ./\fInew-dict-file\fP \e
+
+ | ispell \-a \-T \fIold-dict-string-type\fP \e
+
+ \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e
+
> /dev/null
+
rm dummy.*
+
.fi
+
@@ -622,7 +622,7 @@ or
+
.B stringchar
+
statements.
+
For example, if the hyphen is a boundary character (useful in French),
+
-the string "foo-bar" would be a single word, but "-foo" would be the
+
+the string "foo-bar" would be a single word, but "\-foo" would be the
+
same as "foo", and "foo--bar" would be two words separated by non-word
+
characters.
+
.PP
+
@@ -916,7 +916,7 @@ The following (suffix) replacements:
+
.RS
+
.nf
+
\&. > MENT
+
-Y > -Y,IES
+
+Y > \-Y,IES
+
.fi
+
.RE
+
.PP
+
@@ -956,8 +956,8 @@ Instead, you must use two separate rules:
+
.PP
+
.RS
+
.nf
+
-E > -E,IES
+
-Y > -Y,IES
+
+E > \-E,IES
+
+Y > \-Y,IES
+
.fi
+
.RE
+
.PP
+
@@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write:
+
.PP
+
.RS
+
.nf
+
-E D > -ED,ING # As in covered > covering
+
+E D > \-ED,ING # As in covered > covering
+
.fi
+
.RE
+
.PP
+
@@ -1013,7 +1013,7 @@ If you write:
+
.PP
+
.RS
+
.nf
+
-ED > -ED,ING
+
+ED > \-ED,ING
+
.fi
+
.RE
+
.PP
+
@@ -1021,7 +1021,7 @@ the effect will be the same as:
+
.PP
+
.RS
+
.nf
+
-[ED] > -ED,ING
+
+[ED] > \-ED,ING
+
.fi
+
.RE
+
.PP
+
@@ -1047,7 +1047,7 @@ is useful, as in the following example:
+
.PP
+
.RS
+
.nf
+
-$ munchlist -c oldaffixes -l newaffixes olddict > newdict
+
+$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict
+
.fi
+
.RE
+
.PP
+
@@ -1070,7 +1070,7 @@ flag from the English affix file:
+
.RS
+
.nf
+
flag *S:
+
- [^AEIOU]Y > -Y,IES # As in imply > implies
+
+ [^AEIOU]Y > \-Y,IES # As in imply > implies
+
[AEIOU]Y > S # As in convey > conveys
+
[SXZH] > ES # As in fix > fixes
+
[^SXZHY] > S # As in bat > bats
+
@@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows:
+
flag *R:
+
E > R # As in skate > skater
+
E > RS # As in skate > skaters
+
- [^AEIOU]Y > -Y,IER # As in multiply > multiplier
+
- [^AEIOU]Y > -Y,IERS # As in multiply > multipliers
+
+ [^AEIOU]Y > \-Y,IER # As in multiply > multiplier
+
+ [^AEIOU]Y > \-Y,IERS # As in multiply > multipliers
+
[AEIOU]Y > ER # As in convey > conveyer
+
[AEIOU]Y > ERS # As in convey > conveyers
+
[^EY] > ER # As in build > builder
+
--
+57
pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch
···
+
From: Robert Luberda <robert@debian.org>
+
Date: Mon, 7 Mar 2011 22:23:56 +0100
+
Subject: 0021 Fix gcc warnings
+
+
Fix some gcc warnings.
+
---
+
correct.c | 2 +-
+
languages/english/msgs.h | 8 ++++----
+
tree.c | 2 +-
+
3 files changed, 6 insertions(+), 6 deletions(-)
+
+
diff --git a/correct.c b/correct.c
+
index 79b259f..982b7c6 100644
+
--- a/correct.c
+
+++ b/correct.c
+
@@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange)
+
for (p = start; p != *curchar; p++)
+
(void) putc (*p, logfile);
+
(void) putc (' ', logfile);
+
- (void) fputs (tok, logfile);
+
+ (void) fputs ((char*) tok, logfile);
+
(void) putc ('\n', logfile);
+
(void) fflush (logfile);
+
}
+
diff --git a/languages/english/msgs.h b/languages/english/msgs.h
+
index d33b42b..f9c87ca 100644
+
--- a/languages/english/msgs.h
+
+++ b/languages/english/msgs.h
+
@@ -182,10 +182,10 @@
+
#define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n"
+
#define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n"
+
/* You may add HELP_6 through HELP_9 if your language needs more lines */
+
-#define CORR_C_HELP_6 ""
+
-#define CORR_C_HELP_7 ""
+
-#define CORR_C_HELP_8 ""
+
-#define CORR_C_HELP_9 ""
+
+#define CORR_C_HELP_6 "%s"
+
+#define CORR_C_HELP_7 "%s"
+
+#define CORR_C_HELP_8 "%s"
+
+#define CORR_C_HELP_9 "%s"
+
#define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n"
+
#define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n"
+
#define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n"
+
diff --git a/tree.c b/tree.c
+
index 05a6918..229ae16 100644
+
--- a/tree.c
+
+++ b/tree.c
+
@@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep)
+
struct dent * oldhtab;
+
unsigned int oldhsize;
+
ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN];
+
- int isvariant;
+
+ MASKTYPE isvariant;
+
+
/*
+
* Expand hash table when it is MAXPCT % full.
+
--
+38
pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch
···
+
From: Robert Luberda <robert@debian.org>
+
Date: Tue, 8 Mar 2011 21:12:23 +0100
+
Subject: 0023 Exclusive options
+
+
Make options -x and -b mutually exclusive
+
---
+
ispell.c | 6 ++++--
+
1 files changed, 4 insertions(+), 2 deletions(-)
+
+
diff --git a/ispell.c b/ispell.c
+
index d130a0e..cd5802a 100644
+
--- a/ispell.c
+
+++ b/ispell.c
+
@@ -279,6 +279,7 @@ int main (argc, argv)
+
static char outbuf[BUFSIZ];
+
int argno;
+
int arglen;
+
+ int bflag = 0;
+
+
Cmd = *argv;
+
+
@@ -728,12 +729,13 @@ int main (argc, argv)
+
nodictflag++;
+
break;
+
case 'b':
+
- if (arglen > 2)
+
+ if (arglen > 2 || xflag == 1)
+
usage ();
+
xflag = 0; /* Keep a backup file */
+
+ bflag = 1;
+
break;
+
case 'x':
+
- if (arglen > 2)
+
+ if (arglen > 2 || bflag == 1)
+
usage ();
+
xflag = 1; /* Don't keep a backup file */
+
break;
+
--
+69
pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch
···
+
From: Robert Luberda <robert@debian.org>
+
Date: Tue, 8 Mar 2011 21:00:31 +0100
+
Subject: 0024 Check tempdir creation
+
+
Fail if temporary directory cannot be created.
+
---
+
findaffix.X | 3 ++-
+
munchlist.X | 3 ++-
+
subset.X | 3 ++-
+
zapdups.X | 3 ++-
+
4 files changed, 8 insertions(+), 4 deletions(-)
+
+
diff --git a/findaffix.X b/findaffix.X
+
index 2c253e2..58cabab 100755
+
--- a/findaffix.X
+
+++ b/findaffix.X
+
@@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR"
+
TMP=${TEMPDIR}/faff$$
+
if [ "$TEMPDIR" = "$TDIR" ]
+
then
+
- TOREMOVE="${TMP}*"
+
+ echo "Failed to create temporary directory; exiting"
+
+ exit 1
+
else
+
TOREMOVE="$TEMPDIR"
+
fi
+
diff --git a/munchlist.X b/munchlist.X
+
index ada3f1d..47bb908 100755
+
--- a/munchlist.X
+
+++ b/munchlist.X
+
@@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null` || MUNCHDIR="$TDIR"
+
TMP=${MUNCHDIR}/munch$$
+
if [ "$MUNCHDIR" = "$TDIR" ]
+
then
+
- TOREMOVE="${TMP}*"
+
+ echo "$0: Failed to create temporary directory, exiting..."
+
+ exit 1
+
else
+
TOREMOVE="$MUNCHDIR"
+
fi
+
diff --git a/subset.X b/subset.X
+
index cc748ec..9c904cc 100755
+
--- a/subset.X
+
+++ b/subset.X
+
@@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR"
+
TMP=${TEMPDIR}/sset$$
+
if [ "$TEMPDIR" = "$TDIR" ]
+
then
+
- TOREMOVE="${TMP}*"
+
+ echo "$0: Failed to create temporary directory, exiting..."
+
+ exit 1
+
else
+
TOREMOVE="$TEMPDIR"
+
fi
+
diff --git a/zapdups.X b/zapdups.X
+
index a68852a..1c610d4 100755
+
--- a/zapdups.X
+
+++ b/zapdups.X
+
@@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR"
+
TMP=${TEMPDIR}/zapd$$
+
if [ "$TEMPDIR" = "$TDIR" ]
+
then
+
- TOREMOVE="${TMP}*"
+
+ echo "$0: Failed to create temporary directory, exiting..."
+
+ exit 1
+
else
+
TOREMOVE="$TEMPDIR"
+
fi
+
--
+81
pkgs/tools/text/ispell/patches/0025-Languages.patch
···
+
From: Robert Luberda <robert@debian.org>
+
Date: Tue, 8 Mar 2011 21:02:47 +0100
+
Subject: 0025 Languages
+
+
Fix a few words.
+
---
+
languages/english/british.0 | 1 +
+
languages/english/english.0 | 8 ++++++--
+
languages/english/english.1 | 3 ++-
+
3 files changed, 9 insertions(+), 3 deletions(-)
+
+
diff --git a/languages/english/british.0 b/languages/english/british.0
+
index dc4caa7..04d9177 100644
+
--- a/languages/english/british.0
+
+++ b/languages/english/british.0
+
@@ -46,6 +46,7 @@ armour/DGMRSZ
+
armoured/U
+
armourer/MS
+
armoury/DMS
+
+artefact/MS
+
atomisation/MS
+
atomise/DGRSZ
+
authorisation/AMS
+
diff --git a/languages/english/english.0 b/languages/english/english.0
+
index fc13212..f85e15a 100644
+
--- a/languages/english/english.0
+
+++ b/languages/english/english.0
+
@@ -3502,6 +3502,7 @@ closure/DGMS
+
cloth/DGS
+
clothe/DGS
+
clothed/U
+
+cloths
+
cloud/DGS
+
clouded/U
+
cloudless/PY
+
@@ -10019,9 +10020,10 @@ mystery/MS
+
mystic/MS
+
mystical/Y
+
mysticism/S
+
-myth/MS
+
+myth/M
+
mythical/Y
+
mythology/MS
+
+myths
+
nag/MS
+
nail/DGRS
+
naive/PRY
+
@@ -14818,6 +14820,7 @@ tent/DGRS
+
tentacle/DS
+
tentative/PY
+
tented/U
+
+tenth
+
tenths
+
tenure/DS
+
tenured/U
+
@@ -16511,8 +16514,9 @@ youngster/MS
+
your/MS
+
yourself
+
yourselves
+
-youth/MS
+
+youth/M
+
youthful/PY
+
+youths
+
yuck
+
Yugoslavian/MS
+
yummy/R
+
diff --git a/languages/english/english.1 b/languages/english/english.1
+
index 2bfac86..78a7edf 100644
+
--- a/languages/english/english.1
+
+++ b/languages/english/english.1
+
@@ -7449,7 +7449,8 @@ metalloid
+
metallurgic
+
metallurgical/Y
+
metallurgists
+
-metalsmith/S
+
+metalsmith
+
+metalsmiths
+
metalwork/GJR
+
metamorphic
+
metamorphism
+
--
+35
pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch
···
+
From: Robert Luberda <robert@debian.org>
+
Date: Mon, 21 Mar 2011 10:36:15 +0100
+
Subject: 0030 Display whole multibyte character
+
+
Display all bytes from multibyte characters instead of converting them
+
into `cat -v' format. This fixes an ugly screen content shown while
+
checking UTF-8 files.
+
---
+
correct.c | 11 +++++++----
+
1 files changed, 7 insertions(+), 4 deletions(-)
+
+
diff --git a/correct.c b/correct.c
+
index 982b7c6..c91b41b 100644
+
--- a/correct.c
+
+++ b/correct.c
+
@@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw)
+
ichar = SET_SIZE + laststringch;
+
else
+
ichar = chartoichar (ch);
+
- if (!vflag && iswordch (ichar) && len == 1)
+
+ if (!vflag && iswordch (ichar) && len >= 1)
+
{
+
- if (output)
+
- (void) putchar (ch);
+
- (*cp)++;
+
+ for (i = 0; i < len; ++i)
+
+ {
+
+ if (output)
+
+ (void) putchar (**cp);
+
+ (*cp)++;
+
+ }
+
return 1;
+
}
+
if (ch == '\t')
+
--
-39
pkgs/tools/typesetting/tex/tex4ht/default.nix
···
-
{stdenv, fetchurl, tetex, unzip}:
-
-
stdenv.mkDerivation rec {
-
name = "tex4ht-1.0.2009_06_11_1038";
-
-
src = fetchurl {
-
url = "http://tug.org/applications/tex4ht/tex4ht.zip";
-
sha256 = "15gj18ihds6530af42clpa4zskak5kah9wzs2hd19a9ymwjsccd6";
-
};
-
-
buildInputs = [ tetex unzip ];
-
-
hardeningDisable = [ "format" ];
-
-
buildPhase = ''
-
cd src
-
for f in tex4ht t4ht htcmd ; do
-
# -DENVFILE="$out/share/texmf-nix/tex4ht/base/unix/tex4ht.env"
-
''${CC:-gcc} -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea
-
done
-
cd -
-
'';
-
-
installPhase = ''
-
mkdir -p $out/bin
-
for f in src/tex4ht src/t4ht src/htcmd "bin/unix/"*; do
-
mv $f $out/bin/
-
done
-
mv texmf $out/texmf-dist
-
'';
-
-
meta = {
-
homepage = http://tug.org/tex4ht/;
-
description = "A system to convert (La)TeX documents to HTML and various other formats";
-
license = stdenv.lib.licenses.lppl12;
-
platforms = stdenv.lib.platforms.unix;
-
broken = true; # use the one from texlive.tex4ht
-
};
-
}
+39
pkgs/tools/video/untrunc/default.nix
···
+
{ stdenv, gcc, libav_12, fetchFromGitHub }:
+
+
stdenv.mkDerivation rec {
+
name = "untrunc-${version}";
+
version = "2018.01.13";
+
+
src = fetchFromGitHub {
+
owner = "ponchio";
+
repo = "untrunc";
+
rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7";
+
sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087";
+
};
+
+
buildInputs = [ gcc libav_12 ];
+
+
# Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'.
+
# The latter must be created through 'configure'.
+
libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: {
+
name = "libav-configured-src";
+
outputs = [ "out" ];
+
phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ];
+
installPhase = "cp -r . $out";
+
});
+
+
buildCommand = ''
+
mkdir -p $out/bin
+
g++ -o $out/bin/untrunc \
+
-Wno-deprecated-declarations \
+
$src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \
+
-I$libavConfiguredSrc -lavformat -lavcodec -lavutil
+
'';
+
+
meta = with stdenv.lib; {
+
description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video";
+
license = licenses.gpl2;
+
homepage = https://github.com/ponchio/untrunc;
+
maintainers = [ maintainers.earvstedt ];
+
};
+
}
+1
pkgs/top-level/aliases.nix
···
bridge_utils = bridge-utils; # added 2015-02-20
btrfsProgs = btrfs-progs; # added 2016-01-03
bundler_HEAD = bundler; # added 2015-11-15
+
cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16
cifs_utils = cifs-utils; # added 2016-08
clangAnalyzer = clang-analyzer; # added 2015-02-20
+17 -4
pkgs/top-level/all-packages.nix
···
inetutils = callPackage ../tools/networking/inetutils { };
+
infiniband-diags = callPackage ../tools/networking/infiniband-diags { };
+
inform7 = callPackage ../development/compilers/inform7 { };
infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
···
kea = callPackage ../tools/networking/kea {
boost = boost165;
};
+
+
ispell = callPackage ../tools/text/ispell {};
kindlegen = callPackage ../tools/typesetting/kindlegen { };
···
stdman = callPackage ../data/documentation/stdman { };
storebrowse = callPackage ../tools/system/storebrowse { };
+
+
stubby = callPackage ../tools/networking/stubby { };
syntex = callPackage ../tools/graphics/syntex {};
···
untex = callPackage ../tools/text/untex { };
+
untrunc = callPackage ../tools/video/untrunc { };
+
upx = callPackage ../tools/compression/upx { };
uqmi = callPackage ../tools/networking/uqmi { };
···
libb2 = callPackage ../development/libraries/libb2 { };
libbap = callPackage ../development/libraries/libbap {
-
inherit (ocamlPackages_4_02) bap ocaml findlib ctypes;
+
inherit (ocamlPackages) bap ocaml findlib ctypes;
};
libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
···
caladea = callPackage ../data/fonts/caladea {};
-
cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
+
cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { };
carlito = callPackage ../data/fonts/carlito {};
···
cm_unicode = callPackage ../data/fonts/cm-unicode {};
crimson = callPackage ../data/fonts/crimson {};
+
+
deepin-icon-theme = callPackage ../data/icons/deepin-icon-theme { };
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {
inherit (perlPackages) FontTTF;
···
bluez5 = bluez5_28;
fontsConf = makeFontsConf {
fontDirectories = [
+
carlito dejavu_fonts
freefont_ttf xorg.fontmiscmisc
+
liberation_ttf_v1_binary
+
liberation_ttf_v2_binary
clucene_core = clucene_core_2;
···
openjump = callPackage ../applications/misc/openjump { };
openscad = callPackage ../applications/graphics/openscad {};
+
+
opentx = callPackage ../applications/misc/opentx { };
opera = callPackage ../applications/networking/browsers/opera {};
···
tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tewi-font = callPackage ../data/fonts/tewi {};
-
-
tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; };
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
+1 -1
pkgs/top-level/ocaml-packages.nix
···
base64 = callPackage ../development/ocaml-modules/base64 { };
-
bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; };
+
bap = callPackage ../development/ocaml-modules/bap { };
batteries = callPackage ../development/ocaml-modules/batteries { };
+10 -10
pkgs/top-level/php-packages.nix
···
composer = pkgs.stdenv.mkDerivation rec {
name = "composer-${version}";
-
version = "1.6.2";
+
version = "1.6.3";
src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
-
sha256 = "0xjjnbpzar6ybpad77r0b4a96bwrayza8s1s9vz6s634ir98dhvf";
+
sha256 = "1dna9ng77nw002l7hq60b6vz0f1snmnsxj1l7cg4f877msxppjsj";
};
unpackPhase = ":";
···
php-parallel-lint = pkgs.stdenv.mkDerivation rec {
name = "php-parallel-lint-${version}";
-
version = "0.9.2";
+
version = "1.0.0";
src = pkgs.fetchFromGitHub {
owner = "JakubOnderka";
repo = "PHP-Parallel-Lint";
rev = "v${version}";
-
sha256 = "0dzyi6arwpwbjgr366vw3qxibc3naq863p75q433ahznbdygzzm1";
+
sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw";
};
buildInputs = [ pkgs.makeWrapper composer box ];
···
phpcs = pkgs.stdenv.mkDerivation rec {
name = "phpcs-${version}";
-
version = "2.6.0";
+
version = "3.2.3";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-
sha256 = "02mlv44x508rnkzkwiyh7lg2ah7aqyxcq65q9ycj06czm0xdzs41";
+
sha256 = "193axz56j1kyq458q0y38m99bx31jjjldfg6bv71vgm6zh4rvvs1";
};
phases = [ "installPhase" ];
···
description = "PHP coding standard tool";
license = licenses.bsd3;
homepage = https://squizlabs.github.io/PHP_CodeSniffer/;
-
maintainers = with maintainers; [ javaguirre ];
+
maintainers = with maintainers; [ javaguirre etu ];
};
};
phpcbf = pkgs.stdenv.mkDerivation rec {
name = "phpcbf-${version}";
-
version = "2.6.0";
+
version = "3.2.3";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-
sha256 = "1ijf52cgd85ypvw431nnmzij6156ryhfvmajpkr7plfw0iccqc5j";
+
sha256 = "00p0l01shxx1h6g26j2dbfrp9j7im541das4xps4wrsvc4h4da9l";
};
phases = [ "installPhase" ];
···
description = "PHP coding standard beautifier and fixer";
license = licenses.bsd3;
homepage = https://squizlabs.github.io/PHP_CodeSniffer/;
-
maintainers = with maintainers; [ cmcdragonkai ];
+
maintainers = with maintainers; [ cmcdragonkai etu ];
};
};
}; in self
+2 -19
pkgs/top-level/python-packages.nix
···
backports_csv = callPackage ../development/python-modules/backports_csv {};
bap = callPackage ../development/python-modules/bap {
-
bap = pkgs.ocamlPackages_4_02.bap;
+
bap = pkgs.ocamlPackages.bap;
};
bash_kernel = callPackage ../development/python-modules/bash_kernel { };
···
pylibmc = callPackage ../development/python-modules/pylibmc {};
-
pymetar = buildPythonPackage rec {
-
name = "${pname}-${version}";
-
pname = "pymetar";
-
version = "0.20";
-
-
disabled = isPy3k;
-
-
src = pkgs.fetchurl {
-
url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-
sha256 = "1rxyg9465cp6nc47pqxqf092wmbvv2zhffzvaf2w74laal43pgxw";
-
};
-
-
meta = {
-
description = "A command-line tool to show the weather report by a given station ID";
-
homepage = http://www.schwarzvogel.de/software/pymetar.html;
-
license = licenses.gpl2;
-
};
-
};
+
pymetar = callPackage ../development/python-modules/pymetar { };
pysftp = buildPythonPackage rec {
name = "pysftp-${version}";