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

Merge branch 'master' into staging

Browse Source 
>11k more build jobs on master, just for Linux :-/
This way staging will never catch up.
This commit is contained in:
Vladimír Čunát 2017-02-03 15:31:58 +01:00
commit 2ba076e99c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
19 changed files with 400 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -443,6 +443,13 @@ in
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
neededForBoot = true;
};
"/tmp" = mkIf config.boot.tmpOnTmpfs
{ device = "tmpfs";
fsType = "tmpfs";
neededForBoot = true;
# Sync with systemd's tmp.mount;
options = [ "mode=1777" "strictatime" "nosuid" "nodev" ];
};
"/tmp/xchg" =
{ device = "xchg";
fsType = "9p";

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

@ -2,9 +2,9 @@
rec {
major = "5";
minor = "2";
patch = "4";
tweak = "2";
minor = "3";
patch = "0";
tweak = "3";
subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb";
sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84";
};
}

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

@ -9,7 +9,7 @@
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
, defaultIconTheme, glib, ncurses
@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332";
sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy";
sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z";
};
};
@ -65,9 +65,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
# curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
# therefore requires the -fpermissive flag until this package gets updated
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive";
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
# If we call 'configure', 'make' will then call configure again without parameters.
# It's their system.
@ -126,6 +124,13 @@ in stdenv.mkDerivation rec {
sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
# one more fragile test?
sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
# rendering-dependent tests
sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
# not sure about this fragile test
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
'';
makeFlags = "SHELL=${bash}/bin/bash";
@ -219,6 +224,7 @@ in stdenv.mkDerivation rec {
"--without-system-libmspub"
"--without-system-libpagemaker"
"--without-system-libgltf"
"--without-system-libstaroffice"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
];
@ -239,7 +245,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
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
mdds bluez5 glibc libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper

2
pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py
View File

@ -293,7 +293,7 @@ def interpret_tarball_with_md5(x):
'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}}
"""
match = {'key': re.match('^(.*)_TARBALL$', x['key']),
match = {'key': re.match('^(.*)_(TARBALL|JAR)$', x['key']),
'value': re.match('(?P<md5>[0-9a-fA-F]{32})-(?P<tarball>.+)$',
x['value'])}

4
pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json
View File

@ -1,3 +1,5 @@
{
"LIBGLTF": {"subdir": "libgltf/"}
"LIBGLTF": {"subdir": "libgltf/"},
"ODFVALIDATOR": {"subdir": "../extern/"},
"OFFICEOTRON": {"subdir": "../extern/"}
}

231
pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
View File

@ -28,18 +28,25 @@
md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz";
}
{
name = "boost_1_59_0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/boost_1_59_0.tar.bz2";
sha256 = "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca";
md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
md5name = "6aa9a5c6a4ca1016edd0ed1178e3cb87-boost_1_59_0.tar.bz2";
name = "boost_1_60_0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2";
sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b";
md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe";
md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2";
}
{
name = "bsh-2.0b5-src.zip";
url = "http://dev-www.libreoffice.org/src/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip";
sha256 = "90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513";
md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
md5name = "ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip";
name = "breakpad.zip";
url = "http://dev-www.libreoffice.org/src/breakpad.zip";
sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9";
md5 = "415ce291aa6f2ee1d5db7b62bf62ade8";
md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip";
}
{
name = "bsh-2.0b6-src.zip";
url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96";
md5 = "beeca87be45ec87d241ddd0e1bad80c1";
md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
}
{
name = "bzip2-1.0.6.tar.gz";
@ -70,11 +77,11 @@
md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
}
{
name = "libcmis-0.5.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz";
sha256 = "a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6";
md5 = "5821b806a98e6c38370970e682ce76e8";
md5name = "5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz";
name = "libcmis-0.5.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";
sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e";
md5 = "3270154f0f40d86fce849b161f914101";
md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz";
}
{
name = "CoinMP-1.7.6.tgz";
@ -105,11 +112,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.43.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2";
sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9";
md5 = "11bddbb452a8b766b932f859aaeeed39";
md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2";
name = "curl-7.51.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
md5 = "490e19a8ccd1f4a244b50338a0eb9456";
md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
}
{
name = "libe-book-0.1.2.tar.bz2";
@ -133,18 +140,18 @@
md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2";
}
{
name = "expat-2.1.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.1.1.tar.bz2";
sha256 = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67";
md5 = "7380a64a8e3a9d66a9887b01d0d7ea81";
md5name = "7380a64a8e3a9d66a9887b01d0d7ea81-expat-2.1.1.tar.bz2";
name = "expat-2.2.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2";
sha256 = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff";
md5 = "2f47841c829facb346eb6e3fab5212e2";
md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2";
}
{
name = "Firebird-2.5.4.26856-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-2.5.4.26856-0.tar.bz2";
sha256 = "4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3";
md5 = "7a17ec9889424b98baa29e001a054434";
md5name = "7a17ec9889424b98baa29e001a054434-Firebird-2.5.4.26856-0.tar.bz2";
name = "Firebird-2.5.5.26952-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2";
sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1";
md5 = "b0b5293991fcf07347b38431c80be1d4";
md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2";
}
{
name = "fontconfig-2.8.0.tar.gz";
@ -217,11 +224,11 @@
md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
}
{
name = "source-code-font-1.009.tar.gz";
url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce";
md5 = "0279a21fab6f245e85a6f85fea54f511";
md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz";
name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
md5 = "907d6e99f241876695c19ff3db0b8923";
md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
}
{
name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
@ -266,18 +273,18 @@
md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
}
{
name = "graphite-minimal-1.3.6.tgz";
url = "http://dev-www.libreoffice.org/src/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz";
sha256 = "db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8";
md5 = "17df8301bcc459e83f8a8f3aca6183b2";
md5name = "17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz";
name = "graphite2-minimal-1.3.8.tgz";
url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b";
md5 = "4311dd9ace498b57c85f611e0670df64";
md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
}
{
name = "harfbuzz-0.9.40.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-0.9.40.tar.bz2";
sha256 = "1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f";
md5 = "0e27e531f4c4acff601ebff0957755c2";
md5name = "0e27e531f4c4acff601ebff0957755c2-harfbuzz-0.9.40.tar.bz2";
name = "harfbuzz-1.2.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2";
sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1";
md5 = "9f4b6831c86135faef011e991f59f77f";
md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@ -287,11 +294,11 @@
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
name = "hunspell-1.3.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz";
sha256 = "a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c";
md5 = "4967da60b23413604c9e563beacc63b4";
md5name = "4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz";
name = "hunspell-1.4.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb";
md5 = "33d370f7fe5a030985e445a5672b2067";
md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
@ -301,11 +308,11 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-56_1-src.tgz";
url = "http://dev-www.libreoffice.org/src/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz";
sha256 = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816";
md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
md5name = "c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz";
name = "icu4c-57_1-src.tgz";
url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581";
md5 = "976734806026a4ef8bdd17937c8898b9";
md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
}
{
name = "flow-engine-0.9.4.zip";
@ -399,11 +406,11 @@
md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz";
}
{
name = "language-subtag-registry-2016-02-10.tar.bz2";
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-02-10.tar.bz2";
sha256 = "1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353";
md5 = "d1e7c55a0383f7d720d3ead0b6117284";
md5name = "d1e7c55a0383f7d720d3ead0b6117284-language-subtag-registry-2016-02-10.tar.bz2";
name = "language-subtag-registry-2016-07-19.tar.bz2";
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2";
sha256 = "e3dc30bdbfdad442c542dc0e165df9d8d2ba06a357cd55957155d8259d1661dc";
md5 = "8a037dc60b16bf8c5fe871b33390a4a2";
md5name = "8a037dc60b16bf8c5fe871b33390a4a2-language-subtag-registry-2016-07-19.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@ -455,11 +462,11 @@
md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2";
}
{
name = "xmlsec1-1.2.14.tar.gz";
url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz";
sha256 = "390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a";
md5 = "1f24ab1d39f4a51faf22244c94a6203f";
md5name = "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz";
name = "xmlsec1-1.2.20.tar.gz";
url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305";
md5 = "ce12af00283eb90d9281956524250d6e";
md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
}
{
name = "libxml2-2.9.4.tar.gz";
@ -469,11 +476,11 @@
md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
}
{
name = "libxslt-1.1.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz";
sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c";
md5 = "9667bf6f9310b957254fdcf6596600b7";
md5name = "9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.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 = "lp_solve_5.5.tar.gz";
@ -490,11 +497,18 @@
md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
}
{
name = "mdds_0.12.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2";
sha256 = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d";
md5 = "ef2560ed5416652a7fe195305b14cebe";
md5name = "ef2560ed5416652a7fe195305b14cebe-mdds_0.12.1.tar.bz2";
name = "mdds-1.2.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
md5 = "8855cf852a6088cfdc792c6f7ceb0243";
md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.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 = "940057ac8b513b00e8e9ca12ef796762";
md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz";
}
{
name = "libmspub-0.1.2.tar.bz2";
@ -532,11 +546,11 @@
md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
}
{
name = "nss-3.22.2-with-nspr-4.12.tar.gz";
url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e";
md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz";
name = "nss-3.27-with-nspr-4.13.tar.gz";
url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820";
md5 = "0e3eee39402386cf16fd7aaa7399ebef";
md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz";
}
{
name = "libodfgen-0.1.6.tar.bz2";
@ -567,11 +581,11 @@
md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz";
}
{
name = "liborcus-0.9.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.9.2.tar.gz";
sha256 = "adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b";
md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
md5name = "e6efcbe50a5fd4d50d513c9a7a4139b0-liborcus-0.9.2.tar.gz";
name = "liborcus-0.11.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz";
sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256";
md5 = "205badaee72adf99422add8c4c49d669";
md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@ -581,11 +595,11 @@
md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
}
{
name = "libpagemaker-0.0.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2";
sha256 = "43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f";
md5 = "795cc7a59ace4db2b12586971d668671";
md5name = "795cc7a59ace4db2b12586971d668671-libpagemaker-0.0.2.tar.bz2";
name = "libpagemaker-0.0.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
md5 = "5c4985a68be0b79d3f809da5e12b143c";
md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2";
}
{
name = "pixman-0.24.4.tar.bz2";
@ -595,18 +609,18 @@
md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
}
{
name = "libpng-1.6.24.tar.gz";
url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz";
sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3";
md5 = "65213080dd30a9b16193d9b83adc1ee9";
md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz";
name = "libpng-1.6.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
md5 = "897ccec1ebfb0922e83c2bfaa1be8748";
md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz";
}
{
name = "poppler-0.26.4.tar.gz";
url = "http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz";
sha256 = "e05a4d8d8252a564ec7a96a99af772042b2d85275ffda8043f427dde31e97fe8";
md5 = "35c0660065d023365e9854c13e289d12";
md5name = "35c0660065d023365e9854c13e289d12-poppler-0.26.4.tar.gz";
name = "poppler-0.46.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2";
sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a";
md5 = "38c758d84437378ec4f5aae9f875301d";
md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2";
}
{
name = "postgresql-9.2.1.tar.bz2";
@ -685,13 +699,6 @@
md5 = "0168229624cfac409e766913506961a8";
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
}
{
name = "vigra1.6.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz";
sha256 = "1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f";
md5 = "d62650a6f908e85643e557a236ea989c";
md5name = "d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz";
}
{
name = "libvisio-0.1.5.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
@ -714,11 +721,11 @@
md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2";
}
{
name = "libwps-0.4.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwps-0.4.2.tar.bz2";
sha256 = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587";
md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
md5name = "8a6c55542ce80203dd6d3b1cba99d4e5-libwps-0.4.2.tar.bz2";
name = "libwps-0.4.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2";
sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c";
md5 = "027fb17fb9e43553aa6624dc18f830ac";
md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2";
}
{
name = "xsltml_2.1.2.zip";

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

@ -14,18 +14,18 @@
md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz";
}
{
name = "apr-1.4.8.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz";
sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49";
md5 = "eff9d741b0999a9bbab96862dd2a2a3d";
md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.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 = "98492e965963f852ab29f9e61b2ad700";
md5name = "98492e965963f852ab29f9e61b2ad700-apr-1.5.2.tar.gz";
}
{
name = "apr-util-1.5.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz";
sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743";
md5 = "71a11d037240b292f824ba1eb537b4e3";
md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.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 = "866825c04da827c6e5f53daff5569f42";
md5name = "866825c04da827c6e5f53daff5569f42-apr-util-1.5.4.tar.gz";
}
{
name = "boost_1_60_0.tar.bz2";
@ -56,18 +56,18 @@
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
}
{
name = "cairo-1.10.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz";
sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41";
md5 = "f101a9e88b783337b20b2e26dfd26d5f";
md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz";
name = "cairo-1.14.6.tar.xz";
url = "http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
sha256 = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252";
md5 = "23a0b2f0235431d35238df1d3a517fdb";
md5name = "23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz";
}
{
name = "libcdr-0.1.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2";
sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e";
md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2";
name = "libcdr-0.1.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
md5 = "e369f30b5b861ee0fc4f9e6cbad701fe";
md5name = "e369f30b5b861ee0fc4f9e6cbad701fe-libcdr-0.1.3.tar.bz2";
}
{
name = "clucene-core-2.3.3.4.tar.gz";
@ -147,11 +147,11 @@
md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2";
}
{
name = "Firebird-2.5.5.26952-0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2";
sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1";
md5 = "b0b5293991fcf07347b38431c80be1d4";
md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.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 = "821260b61dafc22899d1464d4e91ee6a";
md5name = "821260b61dafc22899d1464d4e91ee6a-Firebird-3.0.0.32483-0.tar.bz2";
}
{
name = "fontconfig-2.8.0.tar.gz";
@ -175,18 +175,18 @@
md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz";
}
{
name = "dejavu-fonts-ttf-2.35.zip";
url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip";
sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747";
md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip";
name = "dejavu-fonts-ttf-2.37.zip";
url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a";
md5 = "33e1e61fab06a547851ed308b4ffef42";
md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip";
}
{
name = "gentiumbasic-fonts-1.10.zip";
url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip";
sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b";
md5 = "35efabc239af896dfb79be7ebdd6e6b9";
md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip";
name = "GentiumBasic_1102.zip";
url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc";
md5 = "1725634df4bb3dcb1b2c91a6175f8789";
md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip";
}
{
name = "liberation-fonts-ttf-1.07.4.tar.gz";
@ -237,6 +237,13 @@
md5 = "edc4d741888bc0d38e32dbaa17149596";
md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
}
{
name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
md5 = "919389b307ee8696288ea3b8210ab974";
md5name = "919389b307ee8696288ea3b8210ab974-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";
@ -266,25 +273,18 @@
md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
}
{
name = "glyphy-0.2.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be";
md5 = "5d303fb955beb9bf112267316ca9d021";
md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2";
name = "graphite2-minimal-1.3.9.tgz";
url = "http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz";
sha256 = "4fcbfa52527fd6fd6b54786c82bdbb96ec6b34fa2e799361e5164b6bbb671b76";
md5 = "3069842a88b8f40c6b83ad2850cda293";
md5name = "3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz";
}
{
name = "graphite2-minimal-1.3.8.tgz";
url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b";
md5 = "4311dd9ace498b57c85f611e0670df64";
md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz";
}
{
name = "harfbuzz-1.2.6.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2";
sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1";
md5 = "9f4b6831c86135faef011e991f59f77f";
md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2";
name = "harfbuzz-1.3.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2";
sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027";
md5 = "5986e1bfcd983d1f6caa53ef64c4abc5";
md5name = "5986e1bfcd983d1f6caa53ef64c4abc5-harfbuzz-1.3.2.tar.bz2";
}
{
name = "hsqldb_1_8_0.zip";
@ -308,11 +308,11 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-57_1-src.tgz";
url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581";
md5 = "976734806026a4ef8bdd17937c8898b9";
md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz";
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 = "flow-engine-0.9.4.zip";
@ -455,18 +455,25 @@
md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2";
}
{
name = "liblangtag-0.5.8.tar.bz2";
url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2";
sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa";
md5 = "aa899eff126216dafe721149fbdb511b";
md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.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 = "284f120247323a35122ab32b4b359c45";
md5name = "284f120247323a35122ab32b4b359c45-liblangtag-0.6.2.tar.bz2";
}
{
name = "xmlsec1-1.2.20.tar.gz";
url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305";
md5 = "ce12af00283eb90d9281956524250d6e";
md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz";
name = "ltm-1.0.zip";
url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483";
md5 = "da283d2e3e72137d0c600ac36b991c9d";
md5name = "da283d2e3e72137d0c600ac36b991c9d-ltm-1.0.zip";
}
{
name = "xmlsec1-1.2.23.tar.gz";
url = "http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
sha256 = "41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f";
md5 = "86b1daaa438f5a7bea9a52d7b9799ac0";
md5name = "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz";
}
{
name = "libxml2-2.9.4.tar.gz";
@ -518,11 +525,11 @@
md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2";
}
{
name = "libmwaw-0.3.7.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2";
sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427";
md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2";
name = "libmwaw-0.3.9.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2";
sha256 = "11a1f318431a052e1d623385351c8e659377d36db3e71e188af55da87ce9461f";
md5 = "d8532ad5630d3f3b2189a7ec5639151b";
md5name = "d8532ad5630d3f3b2189a7ec5639151b-libmwaw-0.3.9.tar.bz2";
}
{
name = "mysql-connector-c++-1.1.4.tar.gz";
@ -559,6 +566,20 @@
md5 = "32572ea48d9021bbd6fa317ddb697abc";
md5name = "32572ea48d9021bbd6fa317ddb697abc-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 = "officeotron-0.7.4-master.jar";
url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
md5 = "8249374c274932a21846fa7629c2aa9b";
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";
@ -567,11 +588,11 @@
md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2";
}
{
name = "openldap-2.4.31.tgz";
url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz";
sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6";
md5 = "804c6cb5698db30b75ad0ff1c25baefd";
md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz";
name = "openldap-2.4.44.tgz";
url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
md5 = "693ac26de86231f8dcae2b4e9d768e51";
md5name = "693ac26de86231f8dcae2b4e9d768e51-openldap-2.4.44.tgz";
}
{
name = "openssl-1.0.2h.tar.gz";
@ -581,11 +602,11 @@
md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz";
}
{
name = "liborcus-0.11.2.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz";
sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256";
md5 = "205badaee72adf99422add8c4c49d669";
md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.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 = "d0ad3a2fcf7008e5b33604bab33df3ad";
md5name = "d0ad3a2fcf7008e5b33604bab33df3ad-liborcus-0.12.1.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@ -602,25 +623,25 @@
md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2";
}
{
name = "pixman-0.24.4.tar.bz2";
url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc";
md5 = "c63f411b3ad147db2bcce1bf262a0e02";
md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2";
name = "pixman-0.34.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e";
md5 = "e80ebae4da01e77f68744319f01d52a3";
md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
}
{
name = "libpng-1.6.24.tar.gz";
url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz";
sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3";
md5 = "65213080dd30a9b16193d9b83adc1ee9";
md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz";
name = "libpng-1.6.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
md5 = "897ccec1ebfb0922e83c2bfaa1be8748";
md5name = "897ccec1ebfb0922e83c2bfaa1be8748-libpng-1.6.28.tar.gz";
}
{
name = "poppler-0.46.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2";
sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a";
md5 = "38c758d84437378ec4f5aae9f875301d";
md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2";
name = "poppler-0.49.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/poppler-0.49.0.tar.xz";
sha256 = "14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f";
md5 = "9e057ed8eee1f9979fa75d8f044783b8";
md5name = "9e057ed8eee1f9979fa75d8f044783b8-poppler-0.49.0.tar.xz";
}
{
name = "postgresql-9.2.1.tar.bz2";
@ -637,32 +658,32 @@
md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz";
}
{
name = "Python-3.5.0.tgz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz";
sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0";
md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz";
name = "Python-3.5.3.tgz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.3.tgz";
sha256 = "d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a";
md5 = "6192f0e45f02575590760e68c621a488";
md5name = "6192f0e45f02575590760e68c621a488-Python-3.5.3.tgz";
}
{
name = "raptor2-2.0.9.tar.gz";
url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz";
sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef";
md5 = "4ceb9316488b0ea01acf011023cf7fff";
md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz";
name = "raptor2-2.0.15.tar.gz";
url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
}
{
name = "rasqal-0.9.30.tar.gz";
url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz";
sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd";
md5 = "b12c5f9cfdb6b04efce5a4a186b8416b";
md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz";
name = "rasqal-0.9.33.tar.gz";
url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c";
md5 = "1f5def51ca0026cd192958ef07228b52";
md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz";
}
{
name = "redland-1.0.16.tar.gz";
url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz";
sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd";
md5 = "32f8e1417a64d3c6f2c727f9053f55ea";
md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz";
name = "redland-1.0.17.tar.gz";
url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681";
md5 = "e5be03eda13ef68aabab6e42aa67715e";
md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz";
}
{
name = "librevenge-0.0.4.tar.bz2";
@ -685,6 +706,13 @@
md5 = "4f8e76c9c6567aee1d66aba49f76a58b";
md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2";
}
{
name = "libstaroffice-0.0.2.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2";
sha256 = "f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899";
md5 = "4012950240c2bf768c9b29ad376123d7";
md5name = "4012950240c2bf768c9b29ad376123d7-libstaroffice-0.0.2.tar.bz2";
}
{
name = "swingExSrc.zip";
url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
@ -721,11 +749,11 @@
md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2";
}
{
name = "libwps-0.4.3.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2";
sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c";
md5 = "027fb17fb9e43553aa6624dc18f830ac";
md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2";
name = "libwps-0.4.4.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2";
sha256 = "387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73";
md5 = "dcfd1d18bfa9818cf3ab21663ba857a3";
md5name = "dcfd1d18bfa9818cf3ab21663ba857a3-libwps-0.4.4.tar.bz2";
}
{
name = "xsltml_2.1.2.zip";
@ -741,4 +769,11 @@
md5 = "44d667c142d7cda120332623eab69f40";
md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz";
}
{
name = "libzmf-0.0.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
md5 = "c611df8664240de0276ab95670f413d8";
md5name = "c611df8664240de0276ab95670f413d8-libzmf-0.0.1.tar.bz2";
}
]

8
pkgs/applications/office/libreoffice/still-primary-src.nix
View File

@ -2,9 +2,9 @@
rec {
major = "5";
minor = "1";
patch = "6";
tweak = "2";
minor = "2";
patch = "5";
tweak = "1";
subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804";
sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp";
};
}

30
pkgs/applications/office/libreoffice/still.nix
View File

@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "0g88dscdmixhv17lzz4k00jrrvmafxzv0bakzf0v9zny2b3hb6r2";
sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "1aqdzw4sqwfli9aah7zjir93nc1v5zdrbbgvmbn5wh1kawa8dr5g";
sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i";
};
};
@ -58,16 +58,6 @@ in stdenv.mkDerivation rec {
inherit (primary-src) src;
# we only have this problem on i686 ATM
patches = if stdenv.is64bit then null else [
(fetchurl {
name = "disable-flaky-tests.diff";
url = "https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git/plain"
+ "/patches/disable-flaky-tests.diff?h=libreoffice_5.1.5_rc2-1";
sha256 = "1v1aiqdi64iijjraj6v4ljzclrd9lqan54hmy2h6m20x3ab005wb";
})
];
# Openoffice will open libcups dynamically, so we link it directly
# to make its dlopen work.
# It also seems not to mention libdl explicitly in some places.
@ -75,9 +65,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
# curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
# therefore requires the -fpermissive flag until this package gets updated
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -fpermissive";
NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
# If we call 'configure', 'make' will then call configure again without parameters.
# It's their system.
@ -127,8 +115,19 @@ in stdenv.mkDerivation rec {
sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
# rendering-dependent test
sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
# tilde expansion in path processing checks the existence of $HOME
sed -e 's@rtl::OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
# rendering-dependent: on my computer the test table actually doesn't fit…
# interesting fact: test disabled on macOS by upstream
sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
# Segfault on DB access
sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
# one more fragile test?
sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
# rendering-dependent tests
sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
'';
makeFlags = "SHELL=${bash}/bin/bash";
@ -216,7 +215,6 @@ in stdenv.mkDerivation rec {
"--without-system-hsqldb"
"--without-system-altlinuxhyph"
"--without-system-lpsolve"
"--without-system-npapi-headers"
"--without-system-libetonyek"
"--without-system-libfreehand"
"--without-system-liblangtag"

19
pkgs/development/libraries/catch/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, cmake, fetchFromGitHub }:
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec {
@ -13,25 +13,16 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cmake ];
dontUseCmakeConfigure = true;
cmakeFlags = [ "-DUSE_CPP14=ON" ];
buildPhase = ''
cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
cd Build
make
cd ..
'';
installPhase = ''
mkdir -p $out
mv include $out/.
'';
doCheck = true;
checkTarget = "test";
meta = with stdenv.lib; {
description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
homepage = "http://catch-lib.net";
license = licenses.boost;
maintainers = with maintainers; [ edwtjo ];
maintainers = with maintainers; [ edwtjo knedlsepp ];
platforms = with platforms; unix;
};
}

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

@ -5,7 +5,7 @@
}:
let
version = "1.4.1";
version = "1.4.2";
inherit (stdenv.lib) optional optionals optionalString;
in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "85a27fab639a1d651737dcb6b69e4101e3fd09522fdfdcb793df810b5cb315bd";
sha256 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg";
};
outputs = [ "out" "dev" ];

8
pkgs/development/libraries/libmwaw/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.9";
version="0.3.10";
name="${baseName}-${version}";
hash="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
url="https://heanet.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.9/libmwaw-0.3.9.tar.xz";
sha256="185jnp7b7s550xpz3bhaii275qw5yd3j29zijkd2rr8h2p9s9z7p";
hash="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj";
url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz";
sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge

26
pkgs/development/libraries/libzmf/default.nix Normal file
View File

@ -0,0 +1,26 @@
{stdenv, fetchurl, boost, icu, libpng, librevenge, zlib, doxygen, pkgconfig, cppunit}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libzmf";
version = "0.0.1";
src = fetchurl {
url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz";
sha256 = "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga";
};
buildInputs = [boost icu libpng librevenge zlib cppunit];
nativeBuildInputs = [doxygen pkgconfig];
meta = {
inherit version;
description = ''A library that parses the file format of Zoner Callisto/Draw documents'';
license = stdenv.lib.licenses.mpl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf";
downloadPage = "http://dev-www.libreoffice.org/src/libzmf/";
updateWalker = true;
};
}

8
pkgs/os-specific/linux/iptables/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, bison, flex
{ stdenv, fetchurl, bison, flex, pkgconfig
, libnetfilter_conntrack, libnftnl, libmnl }:
stdenv.mkDerivation rec {
name = "iptables-${version}";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg";
};
nativeBuildInputs = [ bison flex ];
nativeBuildInputs = [ bison flex pkgconfig ];
buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];

25
pkgs/os-specific/linux/shadow/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pam ? null, glibcCross ? null }:
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, libxslt, libxml2
, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
, pam ? null, glibcCross ? null }:
let
@ -15,14 +17,20 @@ let
in
stdenv.mkDerivation rec {
name = "shadow-4.2.1";
name = "shadow-${version}";
version = "4.4";
src = fetchurl {
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
rev = "${version}";
sha256 = "005qk3n86chc8mlg86qhrns2kpl52n5f3las3m5s6266xij3qwka";
};
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
nativeBuildInputs = [autoreconfHook libxslt libxml2
docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison
];
patches = [ ./keep-path.patch dots_in_usernames ];
@ -33,8 +41,15 @@ stdenv.mkDerivation rec {
preConfigure = ''
export ac_cv_func_setpgrp_void=yes
export shadow_cv_logdir=/var/log
(
head -n -1 "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
tail -n +3 "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml"
) > xmlcatalog
configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
'';
configureFlags = " --enable-man ";
preBuild = assert glibc != null;
''
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd

5
pkgs/servers/x11/xorg/overrides.nix
View File

@ -235,6 +235,11 @@ in
};
libXpm = attrs: attrs // {
name = "libXpm-3.5.12";
src = args.fetchurl {
url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
};
outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
};

13
pkgs/tools/admin/tigervnc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, xorg
{ stdenv, fetchFromGitHub, xorg
, autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config
, fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext
, cmake, libjpeg_turbo, fltk, nettle, libiconv, libtasn1
@ -7,13 +7,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.7.0";
version = "1.7.1";
name = "tigervnc-${version}";
src = fetchgit {
url = "https://github.com/TigerVNC/tigervnc/";
sha256 = "1b6n2gq6078x8dwz471a68jrkgpcxmbiivmlsakr42vrndm7niz3";
rev = "e25272fc74ef09987ccaa33b9bf1736397c76fdf";
src = fetchFromGitHub {
owner = "TigerVNC";
repo = "tigervnc";
sha256 = "0s2v1h24cl5ypnr35hima580xvvsh0cdqi501mvyvi7wz9cp33rj";
rev = "v1.7.1";
};
inherit fontDirectories;

6
pkgs/tools/package-management/nix/default.nix
View File

@ -112,12 +112,12 @@ in rec {
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
suffix = "pre4911_b30d1e7";
suffix = "pre4997_1351b0d";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c";
sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm";
rev = "1351b0df87a0984914769c5dc76489618b3a3fec";
sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1";
};
fromGit = true;
});

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

@ -2676,6 +2676,8 @@ with pkgs;
libx86emu = callPackage ../development/libraries/libx86emu { };
libzmf = callPackage ../development/libraries/libzmf {};
librdmacm = callPackage ../development/libraries/librdmacm { };
libreswan = callPackage ../tools/networking/libreswan { };
@ -13980,7 +13982,6 @@ with pkgs;
freefont_ttf xorg.fontmiscmisc
];
};
mdds = mdds_0_12_1;
clucene_core = clucene_core_2;
lcms = lcms2;
harfbuzz = harfbuzz.override {