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

Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2018-03-03 22:40:32 +02:00
commit 1e107443ad
101 changed files with 2988 additions and 748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/maintainers.nix
View File

@ -199,6 +199,7 @@
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>";
@ -225,6 +226,7 @@
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>";
@ -707,6 +709,7 @@
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>";

2
nixos/modules/services/continuous-integration/jenkins/default.nix
View File

@ -208,7 +208,7 @@ in {
'';
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
'';

2
nixos/modules/services/monitoring/grafana.nix
View File

@ -249,7 +249,7 @@ in {
};
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}
'';
};

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -124,7 +124,7 @@ in {
# 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";

2
nixos/modules/system/boot/initrd-ssh.nix
View File

@ -118,7 +118,7 @@ in
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 =

7
pkgs/applications/altcoins/bitcoin.nix
View File

@ -5,13 +5,13 @@
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 ];
@ -36,6 +36,7 @@ stdenv.mkDerivation rec{
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;
};
}

6
pkgs/applications/altcoins/default.nix
View File

@ -1,11 +1,11 @@
{ 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; };

8
pkgs/applications/altcoins/ethabi.nix
View File

@ -4,16 +4,16 @@ with rustPlatform;
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"];

4
pkgs/applications/altcoins/seth.nix
View File

@ -5,13 +5,13 @@
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];

4
pkgs/applications/audio/mopidy/default.nix
View File

@ -22,8 +22,8 @@ pythonPackages.buildPythonApplication rec {
];
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;

4
pkgs/applications/audio/spotify/default.nix
View File

@ -9,7 +9,7 @@ let
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
# Be careful not to pick the testing version.
version = "1.0.70.399.g5ffabd56-26";
version = "1.0.69.336.g7edcc575-39";
deps = [
alsaLib
@ -54,7 +54,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29";
sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
};
buildInputs = [ dpkg makeWrapper ];

4
pkgs/applications/misc/blender/default.nix
View File

@ -11,11 +11,11 @@
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 =

4
pkgs/applications/misc/gphoto2/default.nix
View File

@ -3,11 +3,11 @@
}:
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 ];

4
pkgs/applications/misc/josm/default.nix
View File

@ -2,11 +2,11 @@
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 ];

4
pkgs/applications/misc/nnn/default.nix
View File

@ -4,13 +4,13 @@ with stdenv.lib;
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 Normal file
View File

@ -0,0 +1,58 @@
{ 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 Normal file
View File

@ -0,0 +1,15 @@
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)

16
pkgs/applications/misc/xpdf/default.nix
View File

@ -1,9 +1,9 @@
{ 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;
@ -17,7 +17,12 @@ stdenv.mkDerivation {
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"];
@ -31,6 +36,11 @@ stdenv.mkDerivation {
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/;
description = "Viewer for Portable Document Format (PDF) files";

4
pkgs/applications/networking/corebird/default.nix
View File

@ -3,14 +3,14 @@
, 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
View File

@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
broken = true;
};
}

4
pkgs/applications/networking/ostinato/default.nix
View File

@ -4,13 +4,13 @@
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 {

12
pkgs/applications/office/libreoffice/default-primary-src.nix
View File

@ -1,17 +1,17 @@
{ 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";
};
}

38
pkgs/applications/office/libreoffice/default.nix
View File

@ -1,14 +1,14 @@
{ 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
@ -29,27 +29,27 @@ let
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";
};
};
@ -106,6 +106,11 @@ in stdenv.mkDerivation rec {
# 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
@ -115,11 +120,13 @@ in stdenv.mkDerivation rec {
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
@ -138,6 +145,8 @@ in stdenv.mkDerivation rec {
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
'';
@ -147,9 +156,6 @@ in stdenv.mkDerivation rec {
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
@ -229,8 +235,10 @@ in stdenv.mkDerivation rec {
"--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"
];
@ -252,9 +260,9 @@ in stdenv.mkDerivation rec {
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;
@ -268,7 +276,7 @@ in stdenv.mkDerivation rec {
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;

500
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View File

@ -1,45 +1,45 @@
[
{
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";
@ -56,18 +56,18 @@
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";
@ -81,28 +81,21 @@
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";
@ -112,25 +105,25 @@
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";
@ -140,32 +133,39 @@
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 = "-libetonyek-0.1.6.tar.bz2";
md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
}
{
name = "expat-2.2.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
name = "libetonyek-0.1.7.tar.xz";
url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
md5 = "";
md5name = "-expat-2.2.3.tar.bz2";
md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
}
{
name = "expat-2.2.5.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
md5 = "";
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";
@ -216,20 +216,6 @@
md5 = "e7a384790b13c29113e22e596ade9687";
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";
@ -249,21 +235,77 @@
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 = "freetype-2.7.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
name = "culmus-0.131.tar.gz";
url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
md5 = "";
md5name = "-freetype-2.7.1.tar.bz2";
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.8.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
md5 = "";
md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
}
{
name = "glm-0.9.4.6-libreoffice.zip";
@ -273,25 +315,25 @@
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";
@ -301,11 +343,11 @@
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";
@ -315,11 +357,18 @@
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";
@ -399,18 +448,18 @@
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";
@ -424,84 +473,77 @@
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";
md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-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";
}
{
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";
@ -518,32 +560,32 @@
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";
@ -560,32 +602,32 @@
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";
@ -595,53 +637,46 @@
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";
name = "openldap-2.4.45.tgz";
url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
md5 = "";
md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2";
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
}
{
name = "openldap-2.4.44.tgz";
url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
name = "openssl-1.0.2m.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
md5 = "";
md5name = "-openldap-2.4.44.tgz";
md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
}
{
name = "openssl-1.0.2k.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
name = "liborcus-0.13.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";
sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937";
md5 = "";
md5name = "-openssl-1.0.2k.tar.gz";
}
{
name = "liborcus-0.12.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
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";
@ -651,18 +686,18 @@
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";
@ -676,7 +711,14 @@
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";
@ -704,7 +746,7 @@
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";
@ -718,14 +760,14 @@
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";
@ -742,32 +784,32 @@
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";
@ -781,13 +823,13 @@
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";
}
]

25
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -1,18 +1,27 @@
{ 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 Normal file
View File

@ -0,0 +1,39 @@
{ 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 ];
};
}

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
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 ];

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ 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
View File

@ -12,7 +12,6 @@ let overridden = set // overrides; set = with overridden; {
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;
@ -107,8 +106,6 @@ let overridden = set // overrides; set = with overridden; {
gnome_panel = callPackage ./desktop/gnome-panel { };
gnome-session = callPackage ./desktop/gnome-session { };
gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { };
gnome-control-center = callPackage ./desktop/gnome-control-center { };

20
pkgs/desktops/gnome-2/desktop/gnome-session/default.nix
View File

@ -1,20 +0,0 @@
{ 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;
}

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -80,7 +80,7 @@ self: super: {
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;

1286
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

24
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -145,17 +145,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
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)

4
pkgs/development/interpreters/elixir/1.6.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.6.0";
sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx";
version = "1.6.2";
sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7";
minimumOTPVersion = "18";
}

4
pkgs/development/interpreters/jruby/default.nix
View File

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
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 ];

4
pkgs/development/interpreters/php/default.nix
View File

@ -353,7 +353,7 @@ in {
};
php72 = generic {
version = "7.2.2";
sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq";
version = "7.2.3";
sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa";
};
}

5
pkgs/development/libraries/glib-networking/default.nix
View File

@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
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)

12
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -35,9 +35,13 @@ stdenv.mkDerivation rec {
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/*
'';
@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
openjpeg libopus librsvg
fluidsynth libvdpau
libwebp xvidcore gnutls mesa
mjpegtools libgme openssl x265 libxml2
libgme openssl x265 libxml2
]
++ libintlOrEmpty
++ optional faacSupport faac
@ -67,7 +71,9 @@ stdenv.mkDerivation rec {
++ 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";

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -1,7 +1,7 @@
{ 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 {
@ -32,7 +32,7 @@ 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;

58
pkgs/development/libraries/hunspell/dictionaries.nix
View File

@ -1,6 +1,6 @@
/* hunspell dictionaries */
{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }:
{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }:
let
@ -168,6 +168,42 @@ let
};
};
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;
};
};
in {
/* ENGLISH */
@ -427,4 +463,24 @@ in {
})
];
};
/* 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";
};
}

6
pkgs/development/libraries/libbap/default.nix
View File

@ -3,13 +3,13 @@
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 ];

4
pkgs/development/libraries/libbson/default.nix
View File

@ -2,13 +2,13 @@
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 ];

4
pkgs/development/libraries/libebur128/default.nix
View File

@ -1,14 +1,14 @@
{ 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 ];

6
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
owner = "gphoto";
repo = "libgphoto2";
rev = "${meta.tag}";
sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am";
sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9";
};
patches = [];
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
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;

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

@ -6,28 +6,15 @@
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
makeWrapper movit pkgconfig sox

24
pkgs/development/libraries/mlt/qt-5.nix
View File

@ -1,4 +1,4 @@
{ 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
}:
@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in
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

4
pkgs/development/libraries/msilbc/default.nix
View File

@ -1,11 +1,11 @@
{ 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 ];

4
pkgs/development/libraries/opendht/default.nix
View File

@ -13,13 +13,13 @@
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 = [

19
pkgs/development/libraries/range-v3/default.nix
View File

@ -1,21 +1,22 @@
{ 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";

4
pkgs/development/libraries/rdkafka/default.nix
View File

@ -2,13 +2,13 @@
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 ];

4
pkgs/development/misc/avr/binutils/default.nix
View File

@ -1,14 +1,14 @@
{ 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++";

21
pkgs/development/ocaml-modules/bap/default.nix
View File

@ -1,18 +1,21 @@
{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;
@ -28,7 +31,7 @@ buildOcaml rec {
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 = ''
@ -45,11 +48,7 @@ buildOcaml rec {
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)";
@ -58,6 +57,6 @@ buildOcaml rec {
homepage = https://github.com/BinaryAnalysisPlatform/bap/;
maintainers = [ maintainers.maurer ];
license = licenses.mit;
broken = versionAtLeast ocaml.version "4.03";
broken = versionOlder ocaml.version "4.03";
};
}

6
pkgs/development/python-modules/bap/default.nix
View File

@ -2,13 +2,13 @@
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 Normal file
View File

@ -0,0 +1,20 @@
{ 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 ];
};
}

4
pkgs/development/tools/ammonite/default.nix
View File

@ -5,12 +5,12 @@
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 ] ;

4
pkgs/development/tools/documentation/mkdocs/default.nix
View File

@ -4,14 +4,14 @@ with python.pkgs;
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 = [

6
pkgs/development/tools/flyway/default.nix
View File

@ -1,12 +1,12 @@
{ 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;

7
pkgs/development/tools/misc/msitools/default.nix
View File

@ -1,12 +1,12 @@
{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 ];
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
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;
};
}

4
pkgs/development/tools/ocaml/jbuilder/default.nix
View File

@ -2,12 +2,12 @@
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 ];

4
pkgs/games/openspades/default.nix
View File

@ -5,14 +5,14 @@
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 ];

4
pkgs/games/xmoto/default.nix
View File

@ -13,10 +13,12 @@ stdenv.mkDerivation rec {
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";
homepage = http://xmoto.tuxfamily.org;

33
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -7,7 +7,7 @@ let
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}";
@ -37,7 +37,7 @@ let
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;
};
@ -50,7 +50,7 @@ let
fetchSubmodules = true;
};
in
in with stdenv.lib.licenses;
{
@ -62,6 +62,7 @@ in
sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72";
};
description = "Port of 4DO/libfreedo to libretro";
license = "Non-commercial";
}).override {
buildPhase = "make";
};
@ -74,6 +75,7 @@ in
sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7";
};
description = "Port of Mednafen's PC Engine core to libretro";
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-pce-fast";
@ -87,6 +89,7 @@ in
sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x";
};
description = "Port of Mednafen's PSX Engine core to libretro";
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-psx";
@ -100,6 +103,7 @@ in
sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c";
};
description = "Port of Mednafen's Saturn core to libretro";
license = gpl2;
}).override {
buildPhase = "make";
name = "beetle-saturn";
@ -114,6 +118,7 @@ in
sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s";
};
description = "Fork of bsnes with HLE DSP emulation restored";
license = gpl3;
}).override {
buildPhase = "make && cd out";
};
@ -126,6 +131,7 @@ in
sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl";
};
description = "libretro wrapper for desmume NDS emulator";
license = gpl2;
}).override {
configurePhase = "cd desmume";
};
@ -138,6 +144,7 @@ in
sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3";
};
description = "Port of Dolphin to libretro";
license = gpl2Plus;
extraBuildInputs = [
cmake curl mesa pcre pkgconfig sfml miniupnpc
@ -166,6 +173,7 @@ in
sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m";
};
description = "Port of Final Burn Alpha to libretro";
license = "Non-commercial";
}).override {
buildPhase = ''
cd svn-current/trunk \
@ -182,6 +190,7 @@ in
sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b";
};
description = "FCEUmm libretro port";
license = gpl2;
};
gambatte = mkLibRetroCore rec {
@ -192,6 +201,7 @@ in
sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr";
};
description = "Gambatte libretro port";
license = gpl2;
};
genesis-plus-gx = mkLibRetroCore rec {
@ -202,6 +212,7 @@ in
sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c";
};
description = "Enhanced Genesis Plus libretro port";
license = "Non-commercial";
};
mame = (mkLibRetroCore {
@ -212,6 +223,7 @@ in
sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
};
description = "Port of MAME to libretro";
license = gpl2Plus;
extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ];
}).override {
@ -230,6 +242,7 @@ in
sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7";
};
description = "Port of mGBA to libretro";
license = mpl20;
};
mupen64plus = (mkLibRetroCore rec {
@ -240,6 +253,7 @@ in
sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8";
};
description = "Libretro port of Mupen64 Plus, GL only";
license = gpl2;
extraBuildInputs = [ mesa libpng ];
}).override {
@ -254,6 +268,7 @@ in
sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q";
};
description = "nestopia undead libretro port";
license = gpl2;
}).override {
buildPhase = "cd libretro && make";
};
@ -266,6 +281,7 @@ in
sha256 = "19396v50azrb52ifjk298zgcbxn8dvfvp6zwrnzsk6mp8ff7qcqw";
};
description = "Parallel Mupen64plus rewrite for libretro.";
license = gpl2;
extraBuildInputs = [ mesa libpng ];
}).override {
@ -280,6 +296,7 @@ in
sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h";
};
description = "Fast MegaDrive/MegaCD/32X emulator";
license = "MAME";
extraBuildInputs = [ libpng SDL ];
}).override {
@ -295,6 +312,7 @@ in
sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r";
};
description = "ppsspp libretro port";
license = gpl2;
extraBuildInputs = [ mesa ffmpeg ];
}).override {
buildPhase = "cd libretro && make";
@ -308,6 +326,7 @@ in
sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja";
};
description = "Prboom libretro port";
license = gpl2;
}).override {
buildPhase = "make";
};
@ -320,6 +339,7 @@ in
sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1";
};
description = "QuickNES libretro port";
license = lgpl21Plus;
}).override {
buildPhase = "make";
};
@ -332,6 +352,7 @@ in
sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m";
};
description = "Reicast libretro port";
license = gpl2;
extraBuildInputs = [ mesa ];
}).override {
buildPhase = "make";
@ -345,6 +366,7 @@ in
sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy";
};
description = "Libretro port of ScummVM";
license = gpl2;
extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
}).override {
buildPhase = "cd backends/platform/libretro/build && make";
@ -358,6 +380,7 @@ in
sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip";
};
description = "Port of SNES9x git to libretro";
license = "Non-commercial";
}).override {
buildPhase = "cd libretro && make";
};
@ -370,6 +393,7 @@ in
sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij";
};
description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
license = "Non-commercial";
}).override {
buildPhase = ''
make -f Makefile.libretro
@ -385,6 +409,7 @@ in
sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0";
};
description = "Port of Stella to libretro";
license = gpl2;
}).override {
buildPhase = "make";
};
@ -397,6 +422,7 @@ in
sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv";
};
description = "VBA-M libretro port with modifications for speed";
license = gpl2;
};
vba-m = (mkLibRetroCore rec {
@ -407,6 +433,7 @@ in
sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z";
};
description = "vanilla VBA-M libretro port";
license = gpl2;
}).override {
buildPhase = "cd src/libretro && make";
};

14
pkgs/os-specific/darwin/khd/default.nix
View File

@ -1,16 +1,24 @@
{ 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 ];
buildPhase = ''

4
pkgs/os-specific/darwin/kwm/default.nix
View File

@ -2,12 +2,12 @@
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.

4
pkgs/servers/mail/mlmmj/default.nix
View File

@ -3,11 +3,11 @@
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 = ''

10
pkgs/servers/monitoring/grafana/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
version = "4.6.3";
version = "5.0.0";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@ -9,20 +9,20 @@ buildGoPackage rec {
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; {

4
pkgs/servers/monitoring/riemann/default.nix
View File

@ -2,11 +2,11 @@
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 ];

4
pkgs/servers/nosql/neo4j/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
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
View File

@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec {
"-DINSTALL_SHAREDIR=share/mysql"
];
NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
prePatch = ''

4
pkgs/servers/web-apps/searx/default.nix
View File

@ -4,14 +4,14 @@ with pythonPackages;
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 = ''

4
pkgs/tools/audio/abcmidi/default.nix
View File

@ -2,11 +2,11 @@
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

4
pkgs/tools/filesystems/s3fs/default.nix
View File

@ -2,13 +2,13 @@
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 ];

4
pkgs/tools/misc/pastebinit/default.nix
View File

@ -1,12 +1,12 @@
{ 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 ];

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -5,13 +5,13 @@ let
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 ];

6
pkgs/tools/networking/dhcpcd/default.nix
View File

@ -1,11 +1,13 @@
{ 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 Normal file
View File

@ -0,0 +1,44 @@
{ 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" ];
};
}

4
pkgs/tools/networking/openfortivpn/default.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
let repo = "openfortivpn";
version = "1.5.0";
version = "1.6.0";
in stdenv.mkDerivation {
name = "${repo}-${version}";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "adrienverge";
inherit repo;
rev = "v${version}";
sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86";
sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

35
pkgs/tools/networking/stubby/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ 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
View File

@ -4,6 +4,11 @@ stdenv.mkDerivation rec {
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";

4
pkgs/tools/system/nq/default.nix
View File

@ -2,12 +2,12 @@
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 = ''

8
pkgs/tools/system/vboot_reference/default.nix
View File

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"DESTDIR=$(out)"
"HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
];
postInstall = ''
@ -32,9 +33,10 @@ stdenv.mkDerivation rec {
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 Normal file
View File

@ -0,0 +1,47 @@
{ 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 Normal file
View File

@ -0,0 +1,52 @@
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 Normal file
View File

@ -0,0 +1,188 @@
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 Normal file
View File

@ -0,0 +1,48 @@
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 Normal file
View File

@ -0,0 +1,23 @@
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 Normal file
View File

@ -0,0 +1,84 @@
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 Normal file
View File

@ -0,0 +1,62 @@
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 Normal file
View File

@ -0,0 +1,227 @@
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 Normal file
View File

@ -0,0 +1,57 @@
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 Normal file
View File

@ -0,0 +1,38 @@
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 Normal file
View File

@ -0,0 +1,69 @@
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 Normal file
View File

@ -0,0 +1,81 @@
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 Normal file
View File

@ -0,0 +1,35 @@
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
View File

@ -1,39 +0,0 @@
{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 Normal file
View File

@ -0,0 +1,39 @@
{ 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
View File

@ -42,6 +42,7 @@ mapAliases (rec {
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

21
pkgs/top-level/all-packages.nix
View File

@ -2922,6 +2922,8 @@ with pkgs;
inetutils = callPackage ../tools/networking/inetutils { };
infiniband-diags = callPackage ../tools/networking/infiniband-diags { };
inform7 = callPackage ../development/compilers/inform7 { };
infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
@ -3301,6 +3303,8 @@ with pkgs;
boost = boost165;
};
ispell = callPackage ../tools/text/ispell {};
kindlegen = callPackage ../tools/typesetting/kindlegen { };
latex2html = callPackage ../tools/misc/latex2html { };
@ -4785,6 +4789,8 @@ with pkgs;
storebrowse = callPackage ../tools/system/storebrowse { };
stubby = callPackage ../tools/networking/stubby { };
syntex = callPackage ../tools/graphics/syntex {};
fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; };
@ -5140,6 +5146,8 @@ with pkgs;
untex = callPackage ../tools/text/untex { };
untrunc = callPackage ../tools/video/untrunc { };
upx = callPackage ../tools/compression/upx { };
uqmi = callPackage ../tools/networking/uqmi { };
@ -9459,7 +9467,7 @@ with pkgs;
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;
@ -13934,7 +13942,7 @@ with pkgs;
caladea = callPackage ../data/fonts/caladea {};
cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { };
carlito = callPackage ../data/fonts/carlito {};
@ -13958,6 +13966,8 @@ with pkgs;
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;
});
@ -16237,7 +16247,10 @@ with pkgs;
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;
@ -16820,6 +16833,8 @@ with pkgs;
openscad = callPackage ../applications/graphics/openscad {};
opentx = callPackage ../applications/misc/opentx { };
opera = callPackage ../applications/networking/browsers/opera {};
orca = python3Packages.callPackage ../applications/misc/orca {
@ -20474,8 +20489,6 @@ with pkgs;
tewi-font = callPackage ../data/fonts/tewi {};
tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; };
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
# TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive

2
pkgs/top-level/ocaml-packages.nix
View File

@ -54,7 +54,7 @@ let
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 { };

20
pkgs/top-level/php-packages.nix
View File

@ -328,11 +328,11 @@ let
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 = ":";
@ -410,13 +410,13 @@ let
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 ];
@ -443,11 +443,11 @@ let
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" ];
@ -464,17 +464,17 @@ let
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" ];
@ -491,7 +491,7 @@ let
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

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