Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2024-05-21 22:47:32 +03:00
commit 7b015fba1e
34 changed files with 1979 additions and 1560 deletions

View File

@ -8,22 +8,6 @@ let
agentSettingsFormat = pkgs.formats.keyValue {
mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
};
xserverCfg = config.services.xserver;
defaultPinentryFlavor =
if xserverCfg.desktopManager.lxqt.enable
|| xserverCfg.desktopManager.plasma5.enable
|| xserverCfg.desktopManager.plasma6.enable
|| xserverCfg.desktopManager.deepin.enable then
"qt"
else if xserverCfg.desktopManager.xfce.enable then
"gtk2"
else if xserverCfg.enable || config.programs.sway.enable then
"gnome3"
else
"curses";
in
{
imports = [

View File

@ -47,6 +47,7 @@ in
};
};
};
default = { };
example = {
MusicFolder = "/mnt/music";
};

File diff suppressed because it is too large Load Diff

View File

@ -17,13 +17,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-v${version}";
hash = "sha256-q8u2L7CUDUPZrU/i8K5jsqG4Ib0Wh5e/LIUc6Z4SFfY=";
hash = "sha256-/m7Tg+9JHbnwKwWPY8gWIJkIHktGFlqcrbLLgNWjfwU=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -48,9 +48,10 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";
"ckb-merkle-mountain-range-0.6.0" = "sha256-oTe1l406lTpgOefPai664JYwzezLjkIDXpiZTfjbd28=";
"common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
"litep2p-0.3.0" = "sha256-IiJmmSb1+8+HbT/LP/zvhioVBeeGAncf4zo7Czuq6qY=";
"litep2p-0.3.0" = "sha256-y0my2vi0+2CWNOtCh/vtsUbIcU1iNSFAJbLiCktEcOc=";
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
"sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
};

View File

@ -9,21 +9,21 @@
let
appName = "LibreOffice.app";
scriptName = "soffice";
version = "7.6.4";
version = "7.6.7";
dist = {
aarch64-darwin = rec {
arch = "aarch64";
archSuffix = arch;
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "44d141603010771b720fb047a760cb1c184e767528d7c4933b5456c64ebaddb2";
sha256 = "17686aff42734ea4feef08e1189bab3011220000f7784061314c1ae9e5942531";
};
x86_64-darwin = rec {
arch = "x86_64";
archSuffix = "x86-64";
url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
sha256 = "58ecd09fd4b57805d03207f0daf2d3549ceeb774e54bd4a2f339dc6c7b15dbc9";
sha256 = "42d2eeaeee7bcb0e76e9decdcb8f5a4beebf133ad31f7d42a5e96ea770860110";
};
};
in

View File

@ -1,16 +1,13 @@
{ stdenv
, fetchurl
, fetchpatch
, lib
, substituteAll
, pam
, python3
, libxslt
, perl
, ArchiveZip
, perlPackages
, box2d
, gettext
, IOCompress
, zlib
, libjpeg
, liblangtag
@ -53,31 +50,31 @@
, CoinMP
, libwps
, libabw
, libargon2
, libmysqlclient
, autoconf
, automake
, openldap
, bash
, hunspell
, librdf_rasqal
, librdf_redland
, nss
, nspr
, libwpg
, dbus-glib
, clucene_core
, clucene_core_2
, libcdr
, lcms
, lcms2
, unixODBC
, mdds
, sane-backends
, mythes
, libexttextcat
, libvisio
, fontsConf
, pkg-config
, bluez5
, libtool
, carlito
, libatomic_ops
, graphite2
, harfbuzz
@ -89,8 +86,6 @@
, glm
, gst_all_1
, gdb
, commonsLogging
, librdf_rasqal
, gnome
, glib
, ncurses
@ -98,10 +93,13 @@
, gpgme
, libwebp
, abseil-cpp
, libepubgen
, libetonyek
, liborcus
, libpng
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
, wrapQtAppsHook ? null
, qtbase ? null
, qtx11extras ? null
, qtwayland ? null
@ -113,6 +111,18 @@
, variant ? "fresh"
, symlinkJoin
, postgresql
, makeFontsConf
, amiri
, caladea
, carlito
, dejavu_fonts
, rubik
, liberation-sans-narrow
, liberation_ttf_v2
, libertine
, libertine-g
, noto-fonts
, noto-fonts-cjk-sans
# The rest are used only in passthru, for the wrapper
, kauth ? null
, kcompletion ? null
@ -130,7 +140,7 @@
, qttools ? null
, solid ? null
, sonnet ? null
} @ args:
}:
assert builtins.elem variant [ "fresh" "still" ];
@ -141,6 +151,22 @@ let
getDev getLib
optionals optionalString;
fontsConf = makeFontsConf {
fontDirectories = [
amiri
caladea
carlito
dejavu_fonts
rubik
liberation-sans-narrow
liberation_ttf_v2
libertine
libertine-g
noto-fonts
noto-fonts-cjk-sans
];
};
jre' = jre17_minimal.override {
modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];
};
@ -175,6 +201,8 @@ let
help = fetchurl srcsAttributes.help;
};
qtMajor = lib.versions.major qtbase.version;
# See `postPatch` for details
kdeDeps = symlinkJoin {
name = "libreoffice-kde-dependencies-${version}";
@ -195,59 +223,41 @@ in stdenv.mkDerivation (finalAttrs: {
inherit version;
src = fetchurl srcsAttributes.main;
env.NIX_CFLAGS_COMPILE = toString ([
"-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h
"-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [
"-O2" # https://bugs.gentoo.org/727188
]);
postUnpack = ''
mkdir -v $sourceRoot/${tarballPath}
'' + (flip concatMapStrings srcs.third_party (f: ''
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
''))
+ ''
${flip concatMapStrings srcs.third_party (f: ''
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
'')}
ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
tar -xf ${srcs.help}
tar -xf ${srcs.translations}
'';
patches = [
# Skip some broken tests:
# - tdf160386 does not fall back to a CJK font properly for some reason
# - the remaining tests have notes in the patch
# FIXME: get rid of this ASAP
./skip-broken-tests.patch
] ++ lib.optionals (variant == "still") [
# Remove build config to reduce the amount of `-dev` outputs in the
# runtime closure. This behavior was introduced by upstream in commit
# cbfac11330882c7d0a817b6c37a08b2ace2b66f4
./0001-Strip-away-BUILDCONFIG.patch
# Backport fix for tests broken by expired test certificates.
(fetchpatch {
url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a";
hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg=";
})
# Backport libxml 2.12 build fixes
# FIXME: remove in next release
(fetchpatch {
url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb";
hash = "sha256-uEgRx1eyS3Wx2ZDWEsUmpIbuKezVrIbO++qSL2QI8Lk=";
})
(fetchpatch {
url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26";
hash = "sha256-ofhif37uvQI+gidaUpyr6XlyBc3gTJUDBRb3ootrzz0=";
})
# See above
./skip-broken-tests-still.patch
] ++ lib.optionals (variant == "fresh") [
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
./readd-explicit-zlib-link.patch
# See above
./skip-broken-tests-fresh.patch
];
# libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH)
# in the binary causing the closure size to blow up because of many unnecessary
# dependencies to dev outputs. This behavior was patched away in nixpkgs
# (see above), make sure these don't leak again by accident.
disallowedRequisites = lib.optionals (!kdeIntegration)
(lib.concatMap
(x: lib.optional (x?dev) x.dev)
finalAttrs.buildInputs);
postPatch = ''
# configure checks for header 'gpgme++/gpgmepp_version.h',
# and if it is found (no matter where) uses a hardcoded path
@ -255,265 +265,11 @@ in stdenv.mkDerivation (finalAttrs: {
# '#include <context.h>' instead of '#include <gpgmepp/context.h>'.
#
# Fix this path to point to where the headers can actually be found instead.
substituteInPlace configure.ac --replace \
substituteInPlace configure.ac --replace-fail \
'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
'' + optionalString kdeIntegration ''
substituteInPlace shell/source/unix/exec/shellexec.cxx \
--replace xdg-open kde-open5
# configure.ac assumes that the first directory that contains headers and
# libraries during its checks contains *all* the relevant headers/libs which
# obviously doesn't work for us, so we have 2 options:
#
# 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
# dependencies which is ugly and brittle, or
#
# 2. use symlinkJoin to pull in the relevant dependencies and just patch in
# that path which is *also* ugly, but far less likely to break
#
# The 2nd option is not very Nix'y, but I'll take robust over nice any day.
# Additionally, it's much easier to fix if LO breaks on the next upgrade (just
# add the missing dependencies to it).
substituteInPlace configure.ac \
--replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \
--replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \
--replace '$KF5INC ' '$KF5INC ${kdeDeps}/include ${kdeDeps}/include/KF5 '\
--replace '$KF5LIB ' '$KF5LIB ${kdeDeps}/lib '
'';
dontUseCmakeConfigure = true;
dontUseCmakeBuildDir = true;
preConfigure = ''
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
"--with-lang=${concatStringsSep " " langs}"
);
chmod a+x ./bin/unpack-sources
patchShebangs .
# 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"
NOCONFIGURE=1 ./autogen.sh
'';
postConfigure = ''
# fetch_Download_item tries to interpret the name as a variable name, let it do so...
sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
'' /* Test fixups. May need to be revisited/pruned, left alone for now. */ + ''
# unit test sd_tiledrendering seems to be fragile
# 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
# Pivot chart tests. Fragile.
sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx
sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx
# 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
# tilde expansion in path processing checks the existence of $HOME
sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
# fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071
sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -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 — maybe temporarily acceptable for a new version of Fresh?
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(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx
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
# bunch of new Fresh failures. Sigh.
sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx'
sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx'
sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx'
sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx'
sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx'
sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx'
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx'
sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx'
sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk
sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk
sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk
sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk
sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk
sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk
sed -e /CppunitTest_sc_ucalc_formula/d -i sc/Module_sc.mk
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx"
sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx'
# testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4
sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx
'' /* This to avoid using /lib:/usr/lib at linking */ + ''
sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
'' + optionalString stdenv.isAarch64 ''
sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx'
'' + optionalString (variant == "fresh") ''
sed -e '/CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage3Objs->size());/d' -i './sw/qa/core/text/porrst.cxx'
sed -e '/CPPUNIT_ASSERT(pPage4Objs);/d' -i './sw/qa/core/text/porrst.cxx'
sed -e '/CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage4Objs->size());/d' -i './sw/qa/core/text/porrst.cxx'
'';
makeFlags = [ "SHELL=${bash}/bin/bash" ];
enableParallelBuilding = true;
buildTargets = [ "build-nocheck" ];
doCheck = true;
# It installs only things to $out/lib/libreoffice
postInstall = ''
mkdir -p $out/share
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
'';
# Wrapping is done in ./wrapper.nix
dontWrapQtApps = true;
configureFlags = [
(lib.withFeature withHelp "help")
"--with-boost=${getDev boost}"
"--with-boost-libdir=${getLib boost}/lib"
"--with-beanshell-jar=${bsh}"
"--with-vendor=NixOS"
"--disable-report-builder"
"--disable-online-update"
"--enable-python=system"
"--enable-dbus"
"--enable-release-build"
"--enable-epm"
"--with-ant-home=${getLib ant}/lib/ant"
"--with-system-cairo"
"--with-system-libs"
"--with-system-headers"
"--with-system-openssl"
"--with-system-libabw"
"--with-system-liblangtag"
"--without-system-libcmis"
"--with-system-libwps"
"--with-system-openldap"
"--with-system-coinmp"
"--with-system-postgresql"
# Without these, configure does not finish
"--without-junit"
# Schema files for validation are not included in the source tarball
"--without-export-validation"
# We do tarball prefetching ourselves
"--disable-fetch-external"
"--enable-build-opensymbol"
# I imagine this helps. Copied from go-oo.
# Modified on every upgrade, though
"--disable-odk"
"--disable-firebird-sdbc"
"--without-fonts"
"--without-doxygen"
# TODO: package these as system libraries
"--with-system-beanshell"
"--without-system-hsqldb"
"--without-system-altlinuxhyph"
"--without-system-lpsolve"
"--without-system-libetonyek"
"--without-system-libfreehand"
"--without-system-libmspub"
"--without-system-libnumbertext"
"--without-system-libpagemaker"
"--without-system-libstaroffice"
"--without-system-libepubgen"
"--without-system-libqxp"
"--without-system-dragonbox"
"--without-system-libfixmath"
# the "still" variant doesn't support Nixpkgs' mdds 2.1, only mdds 2.0
] ++ optionals (variant == "still") [
"--without-system-mdds"
] ++ optionals (variant == "fresh") [
"--with-system-mdds"
] ++ [
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"
"--without-system-xmlsec"
"--without-system-zxing"
] ++ optionals kdeIntegration [
"--enable-kf5"
"--enable-qt5"
"--enable-gtk3-kde5"
] ++ optionals (variant == "fresh") [
"--without-system-dragonbox"
"--without-system-libfixmath"
# Technically needed only when kdeIntegration is enabled in the "fresh"
# variant. Won't hurt to put it here for every "fresh" variant.
"--without-system-frozen"
];
checkTarget = concatStringsSep " " [
"unitcheck"
"slowcheck"
];
nativeBuildInputs = [
autoconf
automake
@ -523,21 +279,24 @@ in stdenv.mkDerivation (finalAttrs: {
jdk17
libtool
pkg-config
] ++ optionals kdeIntegration [
wrapQtAppsHook
];
buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [
ArchiveZip
buildInputs = finalAttrs.passthru.gst_packages ++ [
# Make libpng not handle APNG images, so LibreOffice's own handler kicks in
# This should be ordered first, so it gets picked up before any other
# propagated libpng
# See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html
(libpng.override { apngSupport = false; })
perlPackages.ArchiveZip
CoinMP
IOCompress
perlPackages.IOCompress
abseil-cpp
ant
bluez5
boost
box2d
cairo
clucene_core
clucene_core_2
cppunit
cups
curl
@ -557,25 +316,28 @@ in stdenv.mkDerivation (finalAttrs: {
gpgme
graphite2
gtk3
harfbuzz
(harfbuzz.override { withIcu = true; })
hunspell
icu
jre'
lcms
lcms2
libGL
libGLU
libX11
libXaw
libXdmcp
libXext
libXi
libXinerama
libXtst
xorg.libX11
xorg.libXaw
xorg.libXdmcp
xorg.libXext
xorg.libXi
xorg.libXinerama
xorg.libXtst
libabw
libargon2
libatomic_ops
libcdr
libe-book
libepoxy
libepubgen
libetonyek
libexttextcat
libjpeg
liblangtag
@ -583,8 +345,8 @@ in stdenv.mkDerivation (finalAttrs: {
libmwaw
libmysqlclient
libodfgen
libpthreadstubs
librdf_rasqal
liborcus
xorg.libpthreadstubs
librdf_redland
librevenge
librsvg
@ -594,7 +356,7 @@ in stdenv.mkDerivation (finalAttrs: {
libwpg
libwps
libxml2
libxshmfence
xorg.libxshmfence
libxslt
libzmf
libwebp
@ -625,6 +387,169 @@ in stdenv.mkDerivation (finalAttrs: {
kio
];
preConfigure = ''
configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES"
# here because we need to be very specific about spaces
"--with-lang=${concatStringsSep " " langs}"
);
patchShebangs .
NOCONFIGURE=1 ./autogen.sh
'' + optionalString kdeIntegration ''
# configure.ac assumes that the first directory that contains headers and
# libraries during its checks contains *all* the relevant headers/libs which
# obviously doesn't work for us, so we have 2 options:
#
# 1. patch configure.ac in order to specify the direct paths to various Qt/KDE
# dependencies which is ugly and brittle, or
#
# 2. use symlinkJoin to pull in the relevant dependencies and just patch in
# that path which is *also* ugly, but far less likely to break
#
# The 2nd option is not very Nix'y, but I'll take robust over nice any day.
# Additionally, it's much easier to fix if LO breaks on the next upgrade (just
# add the missing dependencies to it).
export QT${qtMajor}INC=${kdeDeps}/include
export QT${qtMajor}LIB=${kdeDeps}/lib
export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}"
export KF${qtMajor}LIB=${kdeDeps}/lib
'';
configureFlags = [
# Explicitly passing in --host even on non-cross, because
# LibreOffice will attempt to detect WSL and cross-compile
# itself to Windows automatically, and we don't want it
# doing that.
"--host=${stdenv.hostPlatform.config}"
"--without-buildconfig-recorded"
(lib.withFeature withHelp "help")
"--with-boost=${getDev boost}"
"--with-boost-libdir=${getLib boost}/lib"
"--with-beanshell-jar=${bsh}"
"--with-vendor=NixOS"
"--disable-report-builder"
"--disable-online-update"
"--enable-python=system"
"--enable-dbus"
"--enable-release-build"
"--enable-epm"
"--with-ant-home=${getLib ant}/lib/ant"
"--with-system-cairo"
"--with-system-libs"
"--with-system-headers"
"--with-system-openssl"
"--with-system-libabw"
"--with-system-liblangtag"
"--without-system-libcmis"
"--with-system-libwps"
"--with-system-mdds"
"--with-system-openldap"
"--with-system-coinmp"
"--with-system-postgresql"
# Without these, configure does not finish
"--without-junit"
# Schema files for validation are not included in the source tarball
"--without-export-validation"
# We do tarball prefetching ourselves
"--disable-fetch-external"
"--enable-build-opensymbol"
# I imagine this helps. Copied from go-oo.
# Modified on every upgrade, though
"--disable-odk"
"--disable-firebird-sdbc"
"--without-fonts"
"--without-doxygen"
# TODO: package these as system libraries
"--with-system-beanshell"
"--without-system-hsqldb"
"--without-system-altlinuxhyph"
"--without-system-frozen"
"--without-system-lpsolve"
"--without-system-libfreehand"
"--without-system-libmspub"
"--without-system-libnumbertext"
"--without-system-libpagemaker"
"--without-system-libstaroffice"
"--without-system-libqxp"
"--without-system-dragonbox"
"--without-system-libfixmath"
# is packaged but headers can't be found because there is no pkg-config file
"--without-system-zxcvbn"
"--with-system-orcus"
"--with-system-libepubgen"
"--with-system-libetonyek"
"--without-system-xmlsec"
"--without-system-zxing"
] ++ optionals kdeIntegration [
"--enable-kf${qtMajor}"
"--enable-qt${qtMajor}"
] ++ optionals (kdeIntegration && qtMajor == "5") [
"--enable-gtk3-kde5"
];
env = {
# FIXME: this is a hack, because the right cflags are not being picked up
# from rasqal's .pc file. Needs more investigation.
NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal";
# Provide all the fonts used in tests.
FONTCONFIG_FILE = fontsConf;
};
makeFlags = [ "SHELL=${bash}/bin/bash" ];
enableParallelBuilding = true;
buildTargets = [ "build-nocheck" ];
doCheck = true;
preCheck = ''
export HOME=$(pwd)
'';
checkTarget = concatStringsSep " " [
"unitcheck"
"slowcheck"
"--keep-going" # easier to debug test failures
];
postInstall = ''
mkdir -p $out/share/icons
cp -r sysui/desktop/icons/hicolor $out/share/icons
# Rename icons for consistency
for file in $out/share/icons/hicolor/*/apps/*; do
mv $file "$(dirname $file)/libreoffice-$(basename $file)"
done
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
# Unversionize desktop files
. ./bin/get_config_variables PRODUCTVERSION
for file in $out/lib/libreoffice/share/xdg/*.desktop; do
substituteInPlace $file \
--replace-fail "LibreOffice $PRODUCTVERSION" "LibreOffice" \
--replace-warn "Icon=libreoffice$PRODUCTVERSION" "Icon=libreoffice" \
--replace-fail "Exec=libreoffice$PRODUCTVERSION" "Exec=libreoffice"
done
'';
# Wrapping is done in ./wrapper.nix
dontWrapQtApps = true;
passthru = {
inherit srcs;
jdk = jre';
@ -680,9 +605,18 @@ in stdenv.mkDerivation (finalAttrs: {
];
};
# libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH)
# in the binary causing the closure size to blow up because of many unnecessary
# dependencies to dev outputs. This behavior was patched away in nixpkgs
# (see above), make sure these don't leak again by accident.
# FIXME: disabled for kdeIntegration builds because the weird symlinkJoin setup
# leaks all the -dev dependencies :(
disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) finalAttrs.buildInputs);
requiredSystemFeatures = [ "big-parallel" ];
meta = with lib; {
changelog = "https://wiki.documentfoundation.org/ReleaseNotes/${lib.versions.majorMinor version}";
description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
homepage = "https://libreoffice.org/";
# at least one jar in dependencies

View File

@ -0,0 +1,36 @@
diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk
index 3f7f82329..b7a11088a 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
icu_headers \
icui18n \
icuuc \
+ zlib \
))
ifneq ($(ENABLE_WASM_STRIP_SCEXPORTS),TRUE)
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index a369a626c..cd2fc2be9 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
icu_headers \
icui18n \
icuuc \
+ zlib \
))
$(eval $(call gb_Library_add_exception_objects,wpftdraw,\
diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk
index 3fa007ae5..9b0e37b4b 100644
--- a/writerperfect/Library_wpftimpress.mk
+++ b/writerperfect/Library_wpftimpress.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftimpress,\
odfgen \
staroffice \
revenge \
+ zlib \
))
$(eval $(call gb_Library_add_exception_objects,wpftimpress,\

View File

@ -0,0 +1,21 @@
--- a/svgio/qa/cppunit/data/tdf160386.svg
+++ b/svgio/qa/cppunit/data/tdf160386.svg
@@ -8,7 +8,6 @@
<text systemLanguage="en">Hello!</text>
<text systemLanguage="es">Hola!</text>
<text systemLanguage="fr">Bonjour!</text>
- <text systemLanguage="ja">こんにちは</text>
<text systemLanguage="ru">Привет!</text>
<text>☺</text>
</switch>
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)
{
+ return; // flaky?
+
// Load the document.
// The document embeds a subset of "Source Han Serif SC" so that it works
// even when the font is not installed.

View File

@ -0,0 +1,11 @@
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -1369,6 +1369,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)
{
+ return; // flaky?
+
// Load the document, which embeds a CJK font.
createSwDoc("tdf129810.odt");

View File

@ -0,0 +1,108 @@
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -600,6 +600,8 @@ void DesktopLOKTest::testGetFilterTypes()
void DesktopLOKTest::testSearchCalc()
{
+ return; // flaky
+
LibLibreOffice_Impl aOffice;
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->initializeForRendering(pDocument, nullptr);
@@ -630,6 +632,8 @@ void DesktopLOKTest::testSearchCalc()
void DesktopLOKTest::testSearchAllNotificationsCalc()
{
+ return; // flaky
+
LibLibreOffice_Impl aOffice;
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->initializeForRendering(pDocument, nullptr);
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba)
// Failed: : Test change event for Range.FillRight:
// Tests passed: 4
// Tests failed: 4
-#if !defined(_WIN32)
+#if 0 // flaky, see above
{ OUString("Ranges-3.xls"),
OUString(
"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") },
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs)
CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate)
{
+ return; // fails consistently on nixpkgs?
+
m_pDoc->InsertTab(0, "Formula");
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -284,6 +284,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
{
+ return; // flaky?
+
// Checks the a11y checker is setting the a11y issues to the nodes
// correctly when splitting and appending nodes (through undo), which
// happen on editing all the time.
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -306,6 +306,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
{
+ return; // fails consistently, but only in the sandbox
+
createSwWebDoc("outline-level.html");
// This was 0, HTML imported into Writer lost the outline numbering for
// Heading 1 styles.
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -539,6 +539,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287c)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
{
+ return; // flaky
+
createSwDoc("tdf155177-1-min.odt");
uno::Reference<beans::XPropertySet> xStyle(getStyles("ParagraphStyles")->getByName("Body Text"),
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -601,6 +601,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272)
CPPUNIT_TEST_FIXTURE(Test, testIncorrectSum)
{
+ return; // flaky
+
createSwDoc("incorrectsum.odt");
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2762,6 +2762,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeleteNodeRedlineCallback)
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation)
{
+ return; // flaky on some backends?
+
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
ViewCallback aView1;
int nView1 = SfxLokHelper::getView();
--- a/sw/qa/extras/uiwriter/uiwriter5.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
@@ -1613,6 +1613,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling)
#if !defined(_WIN32)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateInvalidation)
{
+ return; // flaky on KF6
+
createSwDoc();
SwDoc* pDoc = getSwDoc();
CPPUNIT_ASSERT(pDoc);

View File

@ -6,6 +6,13 @@
md5 = "";
md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
}
{
name = "phc-winner-argon2-20190702.tar.gz";
url = "https://dev-www.libreoffice.org/src/phc-winner-argon2-20190702.tar.gz";
sha256 = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c";
md5 = "";
md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
}
{
name = "boost_1_82_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz";
@ -84,11 +91,11 @@
md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz";
}
{
name = "CoinMP-1.7.6.tgz";
url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz";
sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f";
name = "CoinMP-1.8.4.tgz";
url = "https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz";
sha256 = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d";
md5 = "";
md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
md5name = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d-CoinMP-1.8.4.tgz";
}
{
name = "cppunit-1.15.1.tar.gz";
@ -98,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.4.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.4.0.tar.xz";
sha256 = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d";
name = "curl-8.7.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz";
sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd";
md5 = "";
md5name = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d-curl-8.4.0.tar.xz";
md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -140,11 +147,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.5.0.tar.xz";
sha256 = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe";
name = "expat-2.6.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";
sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";
md5 = "";
md5name = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe-expat-2.5.0.tar.xz";
md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -210,11 +217,102 @@
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
name = "noto-fonts-20171024.tar.gz";
url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
name = "NotoKufiArabic-v2.109.zip";
url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip";
sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f";
md5 = "";
md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
}
{
name = "NotoSans-v2.012.zip";
url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip";
sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293";
md5 = "";
md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip";
}
{
name = "NotoSerif-v2.012.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip";
sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a";
md5 = "";
md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip";
}
{
name = "NotoSerifHebrew-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.003.zip";
sha256 = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921";
md5 = "";
md5name = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921-NotoSerifHebrew-v2.003.zip";
}
{
name = "NotoSansArabic-v2.010.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansArabic-v2.010.zip";
sha256 = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2";
md5 = "";
md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip";
}
{
name = "NotoNaskhArabic-v2.016.zip";
url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.016.zip";
sha256 = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac";
md5 = "";
md5name = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac-NotoNaskhArabic-v2.016.zip";
}
{
name = "NotoSansHebrew-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v2.003.zip";
sha256 = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a";
md5 = "";
md5name = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a-NotoSansHebrew-v2.003.zip";
}
{
name = "NotoSansArmenian-v2.008.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansArmenian-v2.008.zip";
sha256 = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac";
md5 = "";
md5name = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac-NotoSansArmenian-v2.008.zip";
}
{
name = "NotoSerifArmenian-v2.008.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerifArmenian-v2.008.zip";
sha256 = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f";
md5 = "";
md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip";
}
{
name = "NotoSansGeorgian-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip";
sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf";
md5 = "";
md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip";
}
{
name = "NotoSerifGeorgian-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerifGeorgian-v2.003.zip";
sha256 = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4";
md5 = "";
md5name = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4-NotoSerifGeorgian-v2.003.zip";
}
{
name = "NotoSansLao-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansLao-v2.003.zip";
sha256 = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0";
md5 = "";
md5name = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0-NotoSansLao-v2.003.zip";
}
{
name = "NotoSerifLao-v2.003.zip";
url = "https://dev-www.libreoffice.org/src/NotoSerifLao-v2.003.zip";
sha256 = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2";
md5 = "";
md5name = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2-NotoSerifLao-v2.003.zip";
}
{
name = "NotoSansLisu-v2.102.zip";
url = "https://dev-www.libreoffice.org/src/NotoSansLisu-v2.102.zip";
sha256 = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268";
md5 = "";
md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip";
}
{
name = "culmus-0.133.tar.gz";
@ -287,11 +385,11 @@
md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip";
}
{
name = "gpgme-1.18.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.18.0.tar.bz2";
sha256 = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e";
name = "gpgme-1.23.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2";
sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224";
md5 = "";
md5name = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e-gpgme-1.18.0.tar.bz2";
md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@ -328,6 +426,13 @@
md5 = "5ade6ae2a99bc1e9e57031ca88d36dad";
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
url = "https://dev-www.libreoffice.org/src/IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
sha256 = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023";
md5 = "";
md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
}
{
name = "icu4c-73_2-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz";
@ -342,6 +447,13 @@
md5 = "";
md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip";
}
{
name = "Java-WebSocket-1.5.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz";
sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720";
md5 = "";
md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz";
}
{
name = "flow-engine-0.9.4.zip";
url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";
@ -434,25 +546,25 @@
md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2";
}
{
name = "lcms2-2.12.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz";
sha256 = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5";
name = "lcms2-2.16.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz";
sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51";
md5 = "";
md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz";
md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz";
}
{
name = "libassuan-2.5.6.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2";
sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426";
name = "libassuan-2.5.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2";
sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76";
md5 = "";
md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2";
md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2";
}
{
name = "libatomic_ops-7.6.8.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz";
sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665";
name = "libatomic_ops-7.8.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz";
sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31";
md5 = "";
md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz";
md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz";
}
{
name = "libeot-0.01.tar.bz2";
@ -476,18 +588,18 @@
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
}
{
name = "libgpg-error-1.43.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2";
sha256 = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf";
name = "libgpg-error-1.48.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2";
sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f";
md5 = "";
md5name = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf-libgpg-error-1.43.tar.bz2";
md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2";
}
{
name = "liblangtag-0.6.3.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2";
sha256 = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd";
name = "liblangtag-0.6.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2";
sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e";
md5 = "";
md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2";
md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2";
}
{
name = "libnumbertext-1.0.11.tar.xz";
@ -497,11 +609,11 @@
md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz";
}
{
name = "ltm-1.2.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/ltm-1.2.1.tar.xz";
sha256 = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f";
name = "ltm-1.3.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/ltm-1.3.0.tar.xz";
sha256 = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08";
md5 = "";
md5name = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f-ltm-1.2.1.tar.xz";
md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
}
{
name = "libwebp-1.3.2.tar.gz";
@ -511,25 +623,25 @@
md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz";
}
{
name = "xmlsec1-1.2.37.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz";
sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c";
name = "xmlsec1-1.3.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz";
sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf";
md5 = "";
md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz";
md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz";
}
{
name = "libxml2-2.11.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz";
sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7";
name = "libxml2-2.12.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.12.6.tar.xz";
sha256 = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb";
md5 = "";
md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz";
md5name = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb-libxml2-2.12.6.tar.xz";
}
{
name = "libxslt-1.1.38.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.38.tar.xz";
sha256 = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1";
name = "libxslt-1.1.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz";
sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0";
md5 = "";
md5name = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1-libxslt-1.1.38.tar.xz";
md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@ -539,18 +651,18 @@
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
{
name = "lxml-4.1.1.tgz";
url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz";
sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e";
name = "lxml-4.9.2.tgz";
url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz";
sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67";
md5 = "";
md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz";
}
{
name = "mariadb-connector-c-3.3.7-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.7-src.tar.gz";
sha256 = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf";
name = "mariadb-connector-c-3.3.8-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz";
sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8";
md5 = "";
md5name = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf-mariadb-connector-c-3.3.7-src.tar.gz";
md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@ -588,11 +700,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.90-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz";
sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739";
name = "nss-3.99-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz";
sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31";
md5 = "";
md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz";
md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@ -616,25 +728,32 @@
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
}
{
name = "openldap-2.6.6.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz";
sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0";
name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
url = "https://dev-www.libreoffice.org/src/onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
sha256 = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90";
md5 = "";
md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz";
md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
}
{
name = "openssl-3.0.11.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.11.tar.gz";
sha256 = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55";
name = "openldap-2.6.7.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz";
sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930";
md5 = "";
md5name = "b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55-openssl-3.0.11.tar.gz";
md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz";
}
{
name = "liborcus-0.18.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.18.1.tar.xz";
sha256 = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb";
name = "openssl-3.0.13.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.13.tar.gz";
sha256 = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313";
md5 = "";
md5name = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb-liborcus-0.18.1.tar.xz";
md5name = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313-openssl-3.0.13.tar.gz";
}
{
name = "liborcus-0.19.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz";
sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39";
md5 = "";
md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz";
}
{
name = "libpagemaker-0.0.4.tar.xz";
@ -644,11 +763,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-5778.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2";
sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06";
name = "pdfium-6179.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2";
sha256 = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c";
md5 = "";
md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2";
md5name = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c-pdfium-6179.tar.bz2";
}
{
name = "pixman-0.42.2.tar.gz";
@ -658,11 +777,11 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.40.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz";
sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1";
name = "libpng-1.6.43.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz";
sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c";
md5 = "";
md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz";
md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz";
}
{
name = "tiff-4.6.0.tar.xz";
@ -686,18 +805,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-13.11.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.11.tar.bz2";
sha256 = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb";
name = "postgresql-13.14.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2";
sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed";
md5 = "";
md5name = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb-postgresql-13.11.tar.bz2";
md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2";
}
{
name = "Python-3.8.18.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz";
sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f";
name = "Python-3.8.19.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz";
sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076";
md5 = "";
md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz";
md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -742,11 +861,11 @@
md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
}
{
name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9";
name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01";
md5 = "";
md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@ -805,11 +924,11 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.tar.xz";
sha256 = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7";
name = "zlib-1.3.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.1.tar.xz";
sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32";
md5 = "";
md5name = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7-zlib-1.3.tar.xz";
md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz";
}
{
name = "libzmf-0.0.2.tar.xz";
@ -819,10 +938,17 @@
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
{
name = "zxing-cpp-2.0.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz";
sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76";
name = "zxcvbn-c-2.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz";
sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd";
md5 = "";
md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz";
md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz";
}
{
name = "zxing-cpp-2.1.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz";
sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe";
md5 = "";
md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz";
}
]

View File

@ -1,4 +1,4 @@
{
sha256 = "0y46gpnrmmpc1sah26w8pvjwnbnr9diblki9hvzygq4n800lqy7d";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz";
sha256 = "0sxvc6raij7rd8n0rg8pg61ppxlpvsx1i551hs53x972156cz2lf";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-help-24.2.3.2.tar.xz";
}

View File

@ -1,4 +1,4 @@
{
sha256 = "07kam9q1nyzff2y77gk4a2jbx403b6m2i1p0p49n6xscyawagzhk";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz";
sha256 = "0r0y92c7i42iiimzg9b1pyldnswh28j8p0lmilz7j1sxv2f0bqpn";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-24.2.3.2.tar.xz";
}

View File

@ -1,4 +1,4 @@
{
sha256 = "0ybn7c569wrj3xj20sx34rym8zkxazv9aj4rv76mbp5b82z0snis";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz";
sha256 = "0jibmsghr9719nmq6w2m947g4arc8dl3wrj5yyg0fy8znnim6477";
url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-translations-24.2.3.2.tar.xz";
}

View File

@ -1 +1 @@
"7.6.4.1"
"24.2.3.2"

View File

@ -7,11 +7,11 @@
md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
}
{
name = "boost_1_80_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_80_0.tar.xz";
sha256 = "322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666";
name = "boost_1_82_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz";
sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de";
md5 = "";
md5name = "322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666-boost_1_80_0.tar.xz";
md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz";
}
{
name = "box2d-2.4.1.tar.gz";
@ -98,11 +98,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.4.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.4.0.tar.xz";
sha256 = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d";
name = "curl-8.6.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.6.0.tar.xz";
sha256 = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15";
md5 = "";
md5name = "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d-curl-8.4.0.tar.xz";
md5name = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15-curl-8.6.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -140,11 +140,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.5.0.tar.xz";
sha256 = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe";
name = "expat-2.6.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz";
sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364";
md5 = "";
md5name = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe-expat-2.5.0.tar.xz";
md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -154,11 +154,11 @@
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
}
{
name = "fontconfig-2.13.94.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz";
sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c";
name = "fontconfig-2.14.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz";
sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b";
md5 = "";
md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz";
md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz";
}
{
name = "crosextrafonts-20130214.tar.gz";
@ -209,13 +209,6 @@
md5 = "e7a384790b13c29113e22e596ade9687";
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61";
md5 = "edc4d741888bc0d38e32dbaa17149596";
md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
}
{
name = "noto-fonts-20171024.tar.gz";
url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
@ -279,6 +272,13 @@
md5 = "";
md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz";
}
{
name = "frozen-1.1.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz";
sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45";
md5 = "";
md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz";
}
{
name = "glm-0.9.9.8.zip";
url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip";
@ -301,11 +301,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-7.1.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz";
sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b";
name = "harfbuzz-8.2.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz";
sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3";
md5 = "";
md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz";
md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@ -329,18 +329,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-72_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-72_1-src.tgz";
sha256 = "a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68";
name = "icu4c-73_2-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz";
sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1";
md5 = "";
md5name = "a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68-icu4c-72_1-src.tgz";
md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz";
}
{
name = "icu4c-72_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-72_1-data.zip";
sha256 = "ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea";
name = "icu4c-73_2-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip";
sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701";
md5 = "";
md5name = "ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea-icu4c-72_1-data.zip";
md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@ -427,11 +427,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
}
{
name = "language-subtag-registry-2023-05-11.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2";
sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da";
name = "language-subtag-registry-2023-08-02.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2";
sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb";
md5 = "";
md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2";
md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2";
}
{
name = "lcms2-2.12.tar.gz";
@ -441,11 +441,11 @@
md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz";
}
{
name = "libassuan-2.5.5.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2";
sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4";
name = "libassuan-2.5.6.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2";
sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426";
md5 = "";
md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2";
md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2";
}
{
name = "libatomic_ops-7.6.8.tar.gz";
@ -469,11 +469,11 @@
md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz";
}
{
name = "libffi-3.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056";
name = "libffi-3.4.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz";
sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676";
md5 = "";
md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
}
{
name = "libgpg-error-1.43.tar.bz2";
@ -483,11 +483,11 @@
md5name = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf-libgpg-error-1.43.tar.bz2";
}
{
name = "liblangtag-0.6.3.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2";
sha256 = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd";
name = "liblangtag-0.6.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2";
sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e";
md5 = "";
md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2";
md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2";
}
{
name = "libnumbertext-1.0.11.tar.xz";
@ -518,18 +518,18 @@
md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz";
}
{
name = "libxml2-2.11.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz";
sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7";
name = "libxml2-2.12.5.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.12.5.tar.xz";
sha256 = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21";
md5 = "";
md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz";
md5name = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21-libxml2-2.12.5.tar.xz";
}
{
name = "libxslt-1.1.35.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz";
sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79";
name = "libxslt-1.1.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz";
sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0";
md5 = "";
md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz";
md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@ -546,18 +546,18 @@
md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
}
{
name = "mariadb-connector-c-3.1.8-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";
sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b";
name = "mariadb-connector-c-3.3.7-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.7-src.tar.gz";
sha256 = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf";
md5 = "";
md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";
md5name = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf-mariadb-connector-c-3.3.7-src.tar.gz";
}
{
name = "mdds-2.0.3.tar.bz2";
url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2";
sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5";
name = "mdds-2.1.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz";
sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56";
md5 = "";
md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2";
md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz";
}
{
name = "mDNSResponder-878.200.35.tar.gz";
@ -588,11 +588,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.90-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz";
sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739";
name = "nss-3.98-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.98-with-nspr-4.35.tar.gz";
sha256 = "59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed";
md5 = "";
md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz";
md5name = "59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed-nss-3.98-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@ -616,25 +616,25 @@
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
}
{
name = "openldap-2.4.59.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz";
sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34";
name = "openldap-2.6.6.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz";
sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0";
md5 = "";
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz";
}
{
name = "openssl-3.0.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz";
sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323";
name = "openssl-3.0.13.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.13.tar.gz";
sha256 = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313";
md5 = "";
md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz";
md5name = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313-openssl-3.0.13.tar.gz";
}
{
name = "liborcus-0.17.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2";
sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143";
name = "liborcus-0.19.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz";
sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39";
md5 = "";
md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2";
md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz";
}
{
name = "libpagemaker-0.0.4.tar.xz";
@ -658,18 +658,18 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz";
sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937";
name = "libpng-1.6.40.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz";
sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1";
md5 = "";
md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz";
md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz";
}
{
name = "tiff-4.5.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz";
sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a";
name = "tiff-4.6.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz";
sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2";
md5 = "";
md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz";
md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz";
}
{
name = "poppler-23.09.0.tar.xz";
@ -686,18 +686,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-13.10.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2";
sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2";
name = "postgresql-13.14.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2";
sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed";
md5 = "";
md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2";
md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2";
}
{
name = "Python-3.8.18.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz";
sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f";
name = "Python-3.8.19.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz";
sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076";
md5 = "";
md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz";
md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -742,11 +742,11 @@
md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
}
{
name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9";
name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9";
md5 = "";
md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@ -791,11 +791,11 @@
md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz";
}
{
name = "libwps-0.4.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz";
sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb";
name = "libwps-0.4.14.tar.xz";
url = "https://dev-www.libreoffice.org/src/libwps-0.4.14.tar.xz";
sha256 = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de";
md5 = "";
md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz";
md5name = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de-libwps-0.4.14.tar.xz";
}
{
name = "xsltml_2.1.2.zip";
@ -805,11 +805,11 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.2.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz";
sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98";
name = "zlib-1.3.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.1.tar.xz";
sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32";
md5 = "";
md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz";
md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz";
}
{
name = "libzmf-0.0.2.tar.xz";
@ -819,10 +819,10 @@
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
{
name = "zxing-cpp-1.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.4.0.tar.gz";
sha256 = "126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862";
name = "zxing-cpp-2.0.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz";
sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76";
md5 = "";
md5name = "126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862-zxing-cpp-1.4.0.tar.gz";
md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz";
}
]

View File

@ -1,4 +1,4 @@
{
sha256 = "1x9i5vihsza6gkib14nmfywk0qb4qa76m1z9333z9c3faj6wp4d3";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-help-7.5.9.2.tar.xz";
sha256 = "1l543k603mbr3rnwlnv9j52mblmvkgj9y49w4v7w3xm8b15331rs";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz";
}

View File

@ -1,4 +1,4 @@
{
sha256 = "1ml826nngwnk96v9ghxdlqhab2f3ml1mxszxqj20j3cl3h9plaip";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-7.5.9.2.tar.xz";
sha256 = "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-7.6.7.2.tar.xz";
}

View File

@ -1,4 +1,4 @@
{
sha256 = "1wmg33cijz32mvg8dhzjibbjjpsgh7s257cn9ckr6k9kg80zrfv7";
url = "https://download.documentfoundation.org/libreoffice/src/7.5.9/libreoffice-translations-7.5.9.2.tar.xz";
sha256 = "1bzmpa04bv8afhl3p68dlicamh0zyckmbdgqb3v72fjmx2h8i64a";
url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz";
}

View File

@ -1 +1 @@
"7.5.9.2"
"7.6.7.2"

View File

@ -1,16 +1,18 @@
{ lib
, stdenv
, buildNpmPackage
, fetchFromGitHub
, imagemagick
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, electron_28
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
makeWrapper,
imagemagick,
copyDesktopItems,
makeDesktopItem,
electron_28,
}:
let
electron = electron_28;
electronDist = "${electron}/${if stdenv.isDarwin then "Applications" else "libexec/electron"}";
in
buildNpmPackage rec {
pname = "blockbench";
@ -23,40 +25,59 @@ buildNpmPackage rec {
hash = "sha256-LuWxjBsOBo6tSlSGaDWrNYcTerIpU+rw3r+zN6gtYb0=";
};
nativeBuildInputs = [
imagemagick # for icon resizing
makeWrapper
copyDesktopItems
];
nativeBuildInputs =
[ makeWrapper ]
++ lib.optionals (!stdenv.isDarwin) [
imagemagick # for icon resizing
copyDesktopItems
];
npmDepsHash = "sha256-CHZdCiewkmToDHhTTvOqQfWrphOw1oGLgwSRRH3YFWE=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
# disable code signing on Darwin
postConfigure = lib.optionalString stdenv.isDarwin ''
export CSC_IDENTITY_AUTO_DISCOVERY=false
sed -i "/afterSign/d" package.json
'';
npmBuildScript = "bundle";
postBuild = ''
# electronDist needs to be modifiable on Darwin
cp -r ${electronDist} electron-dist
chmod -R u+w electron-dist
npm exec electron-builder -- \
--dir \
-c.electronDist=${electron}/libexec/electron \
-c.electronDist=electron-dist \
-c.electronVersion=${electron.version}
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/blockbench
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench
${lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -r dist/mac*/Blockbench.app $out/Applications
makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench
''}
for size in 16 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
done
${lib.optionalString (!stdenv.isDarwin) ''
mkdir -p $out/share/blockbench
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
--add-flags $out/share/blockbench/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--inherit-argv0
for size in 16 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
done
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
--add-flags $out/share/blockbench/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--inherit-argv0
''}
runHook postInstall
'';
@ -81,7 +102,9 @@ buildNpmPackage rec {
homepage = "https://blockbench.net/";
license = lib.licenses.gpl3Only;
mainProgram = "blockbench";
maintainers = with lib.maintainers; [ ckie tomasajt ];
broken = stdenv.isDarwin;
maintainers = with lib.maintainers; [
ckie
tomasajt
];
};
}

View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchgit
, autoreconfHook
, pkg-config
, boost
, cppunit
, librevenge
, libxml2
}:
stdenv.mkDerivation rec {
pname = "libepubgen";
version = "0.1.1";
src = fetchgit {
url = "https://git.code.sf.net/p/libepubgen/code";
rev = "libepubgen-${version}";
hash = "sha256-wPpU8Sfhx9GIgDmT/otT5yV4iQKm9QPZqgSBTfFcbbg=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
boost
cppunit
librevenge
libxml2
];
meta = with lib; {
description = "An EPUB generator for librevenge";
homepage = "https://sourceforge.net/projects/libepubgen/";
license = licenses.mpl20;
maintainers = [ ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchzip }:
stdenv.mkDerivation {
pname = "linux-libertine-g";
version = "2012-01-16";
src = fetchzip {
url = "http://www.numbertext.org/linux/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
hash = "sha256-UGTB7jsI6peivCtEt96RCSi5XHCrnjCSs0Ud5bF7uxk=";
};
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp -r *.ttf $out/share/fonts/truetype
'';
meta = {
description = "Graphite versions of Linux Libertine and Linux Biolinum font families for LibreOffice and OpenOffice.org";
homepage = "https://numbertext.org/linux/";
maintainers = [];
license = lib.licenses.ofl;
};
}

View File

@ -0,0 +1,54 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
# fails on older Boost due to https://github.com/boostorg/phoenix/issues/111
, boost184
, cppunit
, glm
, gperf
, liblangtag
, librevenge
, libxml2
, mdds
}:
stdenv.mkDerivation rec {
pname = "libetonyek";
version = "0.1.10";
src = fetchFromGitHub {
owner = "LibreOffice";
repo = "libetonyek";
rev = "libetonyek-${version}";
hash = "sha256-wgyeQj1sY78sbbZT+NZuq9HEKB+ta7wwipbfN3JkyyU=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
boost184
cppunit
glm
gperf
liblangtag
librevenge
libxml2
mdds
];
configureFlags = ["--with-mdds=2.1"];
meta = with lib; {
description = "A library and a set of tools for reading and converting Apple iWork documents (Keynote, Pages and Numbers).";
homepage = "https://github.com/LibreOffice/libetonyek";
changelog = "https://github.com/LibreOffice/libetonyek/blob/${src.rev}/NEWS";
license = licenses.mpl20;
maintainers = [ ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitLab
, autoreconfHook
, pkg-config
, boost
, mdds
, python3
}:
stdenv.mkDerivation rec {
pname = "libixion";
version = "0.19.0";
src = fetchFromGitLab {
owner = "ixion";
repo = "ixion";
rev = version;
hash = "sha256-BrexWRaxrLTWuoU62kqws3tlSqVOHecSV5MXc4ZezFs=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
boost
mdds
python3
];
meta = with lib; {
description = "A general purpose formula parser, interpreter, formula cell dependency tracker and spreadsheet document model backend all in one package.";
homepage = "https://gitlab.com/ixion/ixion";
changelog = "https://gitlab.com/ixion/ixion/-/blob/${src.rev}/CHANGELOG";
license = licenses.mpl20;
maintainers = [ ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,45 @@
{ lib
, stdenv
, fetchFromGitLab
, autoreconfHook
, pkg-config
, boost
, libixion
, mdds
, python3
, zlib
}:
stdenv.mkDerivation rec {
pname = "liborcus";
version = "0.19.2";
src = fetchFromGitLab {
owner = "orcus";
repo = "orcus";
rev = version;
hash = "sha256-+9C52H99c/kL5DEIoXV+WcLnTftRbicRLQN/FdIXBw8=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
boost
libixion
mdds
python3
zlib
];
meta = with lib; {
description = "Collection of parsers and import filters for spreadsheet documents";
homepage = "https://gitlab.com/orcus/orcus";
changelog = "https://gitlab.com/orcus/orcus/-/blob/${src.rev}/CHANGELOG";
license = licenses.mpl20;
maintainers = [];
platforms = platforms.all;
};
}

View File

@ -17,16 +17,16 @@
buildGoModule rec {
pname = "navidrome";
version = "0.52.0";
version = "0.52.5";
src = fetchFromGitHub {
owner = "navidrome";
repo = "navidrome";
rev = "v${version}";
hash = "sha256-AbavYvXMVJTopnfBFNx2TVqITPZCRtVeUFqROpNmtt8=";
hash = "sha256-M1BxR4Mmkfbr9Wb2YwWEeVGgKOCtD/8pgFZiv8mTi7s=";
};
vendorHash = "sha256-rwRWyegjlDFqbq1/cI2DhC1UJEySJaZkeoxgeH+u5Rc=";
vendorHash = "sha256-puldHJs5GiaXvyvwuzAX00nMLUxoBESpxLOEtBYD7o4=";
npmRoot = "ui";

View File

@ -1,42 +1,39 @@
{ lib
, astor
, buildPythonPackage
, fetchFromGitHub
, funcparserlib
, hy
, pytestCheckHook
, python
, pythonOlder
, testers
{
lib,
astor,
buildPythonPackage,
fetchFromGitHub,
funcparserlib,
hy,
pytestCheckHook,
python,
pythonOlder,
setuptools,
testers,
}:
buildPythonPackage rec {
pname = "hy";
version = "0.28.0";
format = "setuptools";
version = "0.29.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "hylang";
repo = pname;
repo = "hy";
rev = "refs/tags/${version}";
hash = "sha256-XH8qZ6OsTrFXcv/8ZyrTtN6l50JXIUcHJbfCRXHzSTs=";
hash = "sha256-8b2V78mwzSThmVl1SfMGBw8VSpE5rCuucnIyD0nq5To=";
};
# https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10
HY_VERSION = version;
propagatedBuildInputs = [
funcparserlib
] ++
lib.optionals (pythonOlder "3.9") [
astor
];
build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
];
dependencies = [ funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ astor ];
nativeCheckInputs = [ pytestCheckHook ];
preCheck = ''
# For test_bin_hy
@ -53,14 +50,12 @@ buildPythonPackage rec {
# For backwards compatibility with removed pkgs/development/interpreters/hy
# Example usage:
# hy.withPackages (ps: with ps; [ hyrule requests ])
withPackages = python-packages:
(python.withPackages
(ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: {
name = "${hy.name}-env";
meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) {
mainProgram = "hy";
};
});
withPackages =
python-packages:
(python.withPackages (ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: {
name = "${hy.name}-env";
meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; };
});
};
meta = with lib; {
@ -68,6 +63,10 @@ buildPythonPackage rec {
homepage = "https://hylang.org/";
changelog = "https://github.com/hylang/hy/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab mazurel nixy thiagokokada ];
maintainers = with maintainers; [
mazurel
nixy
thiagokokada
];
};
}

View File

@ -1,32 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hy
, pytestCheckHook
, pythonOlder
{
lib,
buildPythonPackage,
fetchFromGitHub,
hy,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "hyrule";
version = "0.5.0";
format = "setuptools";
version = "0.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hylang";
repo = pname;
repo = "hyrule";
rev = "refs/tags/${version}";
hash = "sha256-MARpQFEypTJ4KpojVRxcHYvo6e6Gvk4B6tnrViV6QmY=";
hash = "sha256-pmJhhOpNxVEUH8YwBUKSywYgYu43oLSmpWJM4HXGMiI=";
};
propagatedBuildInputs = [
hy
];
build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
];
propagatedBuildInputs = [ hy ];
nativeCheckInputs = [ pytestCheckHook ];
# Some tests depends on hy on PATH
preCheck = "PATH=${hy}/bin:$PATH";
@ -34,7 +34,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "hyrule" ];
meta = with lib; {
description = "Hyrule is a utility library for the Hy programming language";
description = "Utility library for the Hy programming language";
homepage = "https://github.com/hylang/hyrule";
changelog = "https://github.com/hylang/hylure/releases/tag/${version}";
license = licenses.mit;

View File

@ -1,5 +1,6 @@
{
mkKdeDerivation,
fetchpatch,
qtwayland,
libvncserver,
xorg,
@ -7,6 +8,18 @@
mkKdeDerivation {
pname = "krfb";
# Backports.
# FIXME: remove in next release
patches = [
# Build fix for Qt 6.7.1
./fix-build-with-qt-6.7.1.diff
# Wayland crash fix
(fetchpatch {
url = "https://invent.kde.org/network/krfb/-/commit/6e7a5ba56966ea1b67400be9ab7c82885abb76be.diff";
hash = "sha256-kqD4B2Nixw8KMCOc4RpoEmvII2JZYBPxog6TT/BPuFs=";
})
];
extraCmakeFlags = [
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
];

View File

@ -0,0 +1,51 @@
diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt
index 99f4562..3bf5f63 100644
--- a/framebuffers/pipewire/CMakeLists.txt
+++ b/framebuffers/pipewire/CMakeLists.txt
@@ -9,11 +9,6 @@ set (krfb_framebuffer_pw_SRCS
screencasting.cpp
)
-ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
- PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
- BASENAME zkde-screencast-unstable-v1
-)
-
ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
HEADER krfb_fb_pipewire_debug.h
IDENTIFIER KRFB_FB_PIPEWIRE
@@ -38,6 +33,18 @@ add_library(krfb_framebuffer_pw
MODULE
${krfb_framebuffer_pw_SRCS}
)
+
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+ ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
+ PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ BASENAME zkde-screencast-unstable-v1
+ )
+else()
+ qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
+ FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ )
+endif()
+
set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
target_link_libraries(krfb_framebuffer_pw
diff --git a/framebuffers/pipewire/screencasting.cpp b/framebuffers/pipewire/screencasting.cpp
index 3c4d1ab..c338699 100644
--- a/framebuffers/pipewire/screencasting.cpp
+++ b/framebuffers/pipewire/screencasting.cpp
@@ -5,7 +5,11 @@
*/
#include "screencasting.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
#include "qwayland-zkde-screencast-unstable-v1.h"
+#else
+#include "qwayland-screencast.h"
+#endif
#include <KWayland/Client/registry.h>
#include <QDebug>
#include <QRect>

View File

@ -1,317 +1,317 @@
{
"bluedevil": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/bluedevil-6.0.4.tar.xz",
"hash": "sha256-jFYW3z/rI8C2Y77aOvCaYvZnPbD/6KyLOJiLNNUPfow="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/bluedevil-6.0.5.tar.xz",
"hash": "sha256-mJHTxteC62ofaevsRO0PSG8sfrkKIUOU0rbMbq/1psc="
},
"breeze": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/breeze-6.0.4.tar.xz",
"hash": "sha256-kRl5iJGROVwzMhngkJAgjGWPlDuZU+Qg/GKSQv1eXHY="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-6.0.5.tar.xz",
"hash": "sha256-8kndRGT02mtoGvXE/Q6BF4EnKUstRBE087EOJwP1c3Q="
},
"breeze-grub": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/breeze-grub-6.0.4.tar.xz",
"hash": "sha256-lZDLSj8GgCGMQkrhd0uANmOQ0Mxktq+G6+cuAqPd31A="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-grub-6.0.5.tar.xz",
"hash": "sha256-w9+KYNSYv0WYvGwW1hmnVxdQRnPB9Q9YHN+aZ428f+I="
},
"breeze-gtk": {
"version": "6.0.4.1",
"url": "mirror://kde/stable/plasma/6.0.4/breeze-gtk-6.0.4.1.tar.xz",
"hash": "sha256-QHjlwUDWoBq2WRgz+bNC2rTf8rUyHYXJTX1KLST6i2I="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-gtk-6.0.5.tar.xz",
"hash": "sha256-Uez1bnWimp5P26cG9MKE2W+YsPGLCqnYZkIYw22UuRI="
},
"breeze-plymouth": {
"version": "6.0.4.1",
"url": "mirror://kde/stable/plasma/6.0.4/breeze-plymouth-6.0.4.1.tar.xz",
"hash": "sha256-9zZpOOzu2kKPYyoq2trKBFhGzF7Nb+LBXZ+0JM9j/ks="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-plymouth-6.0.5.tar.xz",
"hash": "sha256-/hcQ+oYSTOCvENFgXMN1cW0/LP6aT87X9PSg6lhYBr4="
},
"discover": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/discover-6.0.4.tar.xz",
"hash": "sha256-oFaw24l2LhfPR0P1oavkZWhQ2y1VJ7xzLPYYDcjVGqg="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/discover-6.0.5.tar.xz",
"hash": "sha256-lEygP+Ex4OkveVsy5Of8cUyaWfwYpLvan1BAjQxq85U="
},
"drkonqi": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/drkonqi-6.0.4.tar.xz",
"hash": "sha256-4O567rzFGICNTifxmv6VnuzvLVSm0Mh23nSxk2XsNxA="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/drkonqi-6.0.5.tar.xz",
"hash": "sha256-EBX5rXNMxOULEK0kNqYGYddLDex0hyW+kIIQMzMCmF0="
},
"flatpak-kcm": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/flatpak-kcm-6.0.4.tar.xz",
"hash": "sha256-OcWhy7sSusqAFLcscN8BZHyrtix9BMJvzqEfiRSJWE0="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/flatpak-kcm-6.0.5.tar.xz",
"hash": "sha256-dBuUbAfQ1OUJ+M8pabIx5fNxAg1y+idqb35hY80nDOM="
},
"kactivitymanagerd": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kactivitymanagerd-6.0.4.tar.xz",
"hash": "sha256-LM1qBGdzIq36oBETAXnU7903CEIreYxP4+Zk9JozrC8="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kactivitymanagerd-6.0.5.tar.xz",
"hash": "sha256-We+Wj6CZDteuxmgr28jFHfEiSil5NAhMRjBgvJFv4J4="
},
"kde-cli-tools": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kde-cli-tools-6.0.4.tar.xz",
"hash": "sha256-OdbpPuLidNOkuHjUa3Yb58szjuJhMl8ybOKRoOyVrm0="
},
"kdecoration": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kdecoration-6.0.4.tar.xz",
"hash": "sha256-D+U/FjLz+oa8TT6EPvySFrKiVwIKflWrV59WueRb1X4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kde-cli-tools-6.0.5.tar.xz",
"hash": "sha256-wAJ64E5pHGkuGowFZdZ3n7Nuyw16949mY7kjD0WBso8="
},
"kde-gtk-config": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kde-gtk-config-6.0.4.tar.xz",
"hash": "sha256-/VSRwrDoh9wgThZhrH82TywJZQhc5PUPoihX4O0oXb0="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kde-gtk-config-6.0.5.tar.xz",
"hash": "sha256-tCKWn3sid9g9eppm25m5mcA8sKtKUDHgCwzN77pX74M="
},
"kdecoration": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kdecoration-6.0.5.tar.xz",
"hash": "sha256-CjxRYcA+i6ED/BCWarveKY3pjiXJRaJK4IpTmnhnAiQ="
},
"kdeplasma-addons": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kdeplasma-addons-6.0.4.tar.xz",
"hash": "sha256-bS1t9HdbppObQ7Q4196asfxhGiEqfu30cN5NVphrOxg="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kdeplasma-addons-6.0.5.tar.xz",
"hash": "sha256-kRr0dUhzwXwcp9SfBmnePjhoWLCa3ygng7nFUQV2upU="
},
"kgamma": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kgamma-6.0.4.tar.xz",
"hash": "sha256-NEXh2trK2AatIPwAi3TagI85ctGLsry++0bmTnCOvqQ="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kgamma-6.0.5.tar.xz",
"hash": "sha256-ZZ3rZG/aFwONRUhpjHrEsIwSZgYjt411Q3pgbWp7rTY="
},
"kglobalacceld": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kglobalacceld-6.0.4.tar.xz",
"hash": "sha256-kUe/JywvjU42U+S1GKF2o2EnYOReYHhbz4fo09ybhdI="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kglobalacceld-6.0.5.tar.xz",
"hash": "sha256-LJs5HA4/kbuLMgApx7l/yBZmWIghBtHfmtRBYAiU/K4="
},
"kinfocenter": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kinfocenter-6.0.4.tar.xz",
"hash": "sha256-WvGrf9XFT5UiFTe9TukT36Bn3f86HLS11IbeU5pIJo4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kinfocenter-6.0.5.tar.xz",
"hash": "sha256-v08sYnJC2CeGcwbE6IR5bH1finoqKURKSUwqytXIiXM="
},
"kmenuedit": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kmenuedit-6.0.4.tar.xz",
"hash": "sha256-LUXBUbrwQI+7nXbhWLqxuFxTmVrzGTNuQkS4e1/W5cg="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kmenuedit-6.0.5.tar.xz",
"hash": "sha256-mqHTlyTLoee49t7YxJCs3+EVmO02jCjpqoZXJpjjWfg="
},
"kpipewire": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kpipewire-6.0.4.tar.xz",
"hash": "sha256-oXRC+09xnxVN4QFYudoHkamkt9otC2+CMD+zt6L0aDY="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kpipewire-6.0.5.tar.xz",
"hash": "sha256-QyfaJDUYbpBlPIcN5zCCp+X7YdE+BqUXywIfHVa30tY="
},
"kscreen": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kscreen-6.0.4.tar.xz",
"hash": "sha256-aNA9i7KFvVk5bGQX70m/AFGHT43iVqi6rGryT43PgAA="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kscreen-6.0.5.tar.xz",
"hash": "sha256-7e2LVYFn2JopqDCnvTx9aSs2XaUpx7blnr2t65Fqk/A="
},
"kscreenlocker": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kscreenlocker-6.0.4.tar.xz",
"hash": "sha256-PBiobSYN8IHcLLzrqixchRqclXcZxeEtQwBPx8Mt69U="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kscreenlocker-6.0.5.tar.xz",
"hash": "sha256-W7lKKg1pzOt+1O/L94a1M4hWfVEKQQ/Z0BvpE9KxY9A="
},
"ksshaskpass": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/ksshaskpass-6.0.4.tar.xz",
"hash": "sha256-6tZPEioyTzF6WABxBZbP4yOfiPmK5HuEl83a8K77NEY="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ksshaskpass-6.0.5.tar.xz",
"hash": "sha256-bfDu70OgQesabXG6Uk/qxX/B9IrrRFQDZvEkBMxJhrw="
},
"ksystemstats": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/ksystemstats-6.0.4.tar.xz",
"hash": "sha256-pKGiCjLue0sD1Pm0o8AcRchb6tbcEyG2g20udxOzh/o="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ksystemstats-6.0.5.tar.xz",
"hash": "sha256-vcb6lcC02tkhDHp3NOHCM7xAjwn8r0lhunCa/6H9QoQ="
},
"kwallet-pam": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kwallet-pam-6.0.4.tar.xz",
"hash": "sha256-gGqL0NocebcAHizPD1Iitk3xn/uWDy24mxHk9NWpqYE="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwallet-pam-6.0.5.tar.xz",
"hash": "sha256-JcYRKOrvtWPlAFR/ZQvik+dRJu1fwvrFdO9AzMv9ANs="
},
"kwayland": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kwayland-6.0.4.tar.xz",
"hash": "sha256-QkMuJkTEuZeFTp/0j6f65fbMURepbyPGC1sc8rgr53o="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwayland-6.0.5.tar.xz",
"hash": "sha256-qLiEEdKtlJfifW29ldZH3l6+YxRWHnqNk1/Xmy/nroQ="
},
"kwayland-integration": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kwayland-integration-6.0.4.tar.xz",
"hash": "sha256-4gPb0gYPoPk0MTb3Y6lV89oQpOpGUEW8ofMEh7CeFeo="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwayland-integration-6.0.5.tar.xz",
"hash": "sha256-sW30rZhRJCo5OHTC1TUgKXMkfduovhP9lZi+hhapoEU="
},
"kwin": {
"version": "6.0.4.1",
"url": "mirror://kde/stable/plasma/6.0.4/kwin-6.0.4.1.tar.xz",
"hash": "sha256-Vv+zf6NuEPBY7FSZxoWPayEQW1asfXBAeSHwY7xLyzY="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwin-6.0.5.tar.xz",
"hash": "sha256-JC59IQUp7GMbxf4/4KEXo9HU7bHdOmRKr9UIkxL4sNc="
},
"kwrited": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/kwrited-6.0.4.tar.xz",
"hash": "sha256-iYAp+/GVwXDZ5eFDYo1tIogZMA+SAZ6rPBOAQtMfFTo="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwrited-6.0.5.tar.xz",
"hash": "sha256-EKtotq1K/3451YlgdNusEGgNDfk/BKzy8tFaPYV/Q1k="
},
"layer-shell-qt": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/layer-shell-qt-6.0.4.tar.xz",
"hash": "sha256-QyyIZjB84boUw8/aWseXb+XgnkWk+gs1zJbkZ+lLBiY="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/layer-shell-qt-6.0.5.tar.xz",
"hash": "sha256-vWv3PcebVh3TjB/HjDc7LvS532nWqCfjBdAREJ2RosI="
},
"libkscreen": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/libkscreen-6.0.4.tar.xz",
"hash": "sha256-QGko2isD8l5qt8jkQF6Ptn4SYHiRnYKG+kfzaJ+1q1c="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libkscreen-6.0.5.tar.xz",
"hash": "sha256-Aad1afNy01TBcqI/LU4GYXAcAk5E2XKXGxRnNeFq4dk="
},
"libksysguard": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/libksysguard-6.0.4.tar.xz",
"hash": "sha256-VmrC8GAwEokrIpGqbUZjsG6mVMPbNm9lpZ4yUDv6jeo="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libksysguard-6.0.5.tar.xz",
"hash": "sha256-ypVPW7V3AL0UuuMjOoIJTqadMiccw+3W0yvPONsj4Xc="
},
"libplasma": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/libplasma-6.0.4.tar.xz",
"hash": "sha256-YcLBSEVsuXx8EEcRtWz/AQv+V4XD8QxbZayASjNG/XQ="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libplasma-6.0.5.tar.xz",
"hash": "sha256-01dlwDmQHnObAU/5JkDGzUpNhSTCb+TQC9E00WqwzNI="
},
"milou": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/milou-6.0.4.tar.xz",
"hash": "sha256-HIw+BEnhDcfHfPkF6qbH4E3mA2u7hGKbIqE63EI84f8="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/milou-6.0.5.tar.xz",
"hash": "sha256-cI4YtbQkmFoWdQfptZNN6TxlrK8vUkRmMS0JUV64Qs8="
},
"ocean-sound-theme": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/ocean-sound-theme-6.0.4.tar.xz",
"hash": "sha256-OgmXNgFb92gk/qaGBEJNCsyvVoQGh8GGds9gAnOkCZk="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ocean-sound-theme-6.0.5.tar.xz",
"hash": "sha256-YBXzkxp0E0/dfu9cfHWS74t0D8wITXcm+N+ZPcUon2s="
},
"oxygen": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/oxygen-6.0.4.tar.xz",
"hash": "sha256-kVDgCYmnLP81u0bFrJryXKvO5MwYKZyL5we+6ExeVG8="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/oxygen-6.0.5.tar.xz",
"hash": "sha256-flQ3LW/ca3Nz2UjZSJ8+lLRXpvIqjwD26t4zzYPOgCI="
},
"oxygen-sounds": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/oxygen-sounds-6.0.4.tar.xz",
"hash": "sha256-4p++hTBBMqrrnWVBni5w9DyN7wzkcHgZUJ11QBkcoxk="
},
"plasma5support": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma5support-6.0.4.tar.xz",
"hash": "sha256-UTUfrsaTG0aWF4vUnZ5gvJ3iw/PRD/CrOFSuPZApdaE="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/oxygen-sounds-6.0.5.tar.xz",
"hash": "sha256-azR0er1oOQF9DqzB1SyFtSbbtnggH8TMNxknhnElOVI="
},
"plasma-activities": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-activities-6.0.4.tar.xz",
"hash": "sha256-yDjDpxkZa6Bu09cYs/TfhBTifIR+IG/KoxBZWb55320="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-6.0.5.tar.xz",
"hash": "sha256-iBGHa8aQJ47NczsjOsRepPuwa8GmLZ4XuSaKpNBeplg="
},
"plasma-activities-stats": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-activities-stats-6.0.4.tar.xz",
"hash": "sha256-hs5jZ0/Vw1WtE6J1Umvqd0pKjGGfMjGg6thWVZGz7ws="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-stats-6.0.5.tar.xz",
"hash": "sha256-16qv+XsfDDyUGxNKM/d9la8JXLsaZO/nQdev0VyYe18="
},
"plasma-browser-integration": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-browser-integration-6.0.4.tar.xz",
"hash": "sha256-LBA0/4Q56DMES8cAJc5C2elJ4OpJg+ofQc30LRigKxc="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-browser-integration-6.0.5.tar.xz",
"hash": "sha256-MNzpVeJ6p2VsgnWCQK3umPJ3NglrwPgyodEDTM8+5Bg="
},
"plasma-desktop": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-desktop-6.0.4.tar.xz",
"hash": "sha256-hiFSrpcefS5NwHzF+DDvEhMZ4W+OgpnUB0lOcwz9xb4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-desktop-6.0.5.tar.xz",
"hash": "sha256-XZABuuoy41BVM3Zn8gTijyBuvMqgoXLg8QlCa6gELs8="
},
"plasma-disks": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-disks-6.0.4.tar.xz",
"hash": "sha256-/S9dIwPDFG7KLvB1FPLQIACjftiZofnRf/A2f4fNT8A="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-disks-6.0.5.tar.xz",
"hash": "sha256-Mh7C8xdwQiOZcnjvS/O5zwEuL/rsWo1X5X/qxoFOOtg="
},
"plasma-firewall": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-firewall-6.0.4.tar.xz",
"hash": "sha256-vS8X7kWlz3COMXKGPmcXfZRtqbEkrhD7Yl+NPvASQ64="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-firewall-6.0.5.tar.xz",
"hash": "sha256-C1LnQTzHRdl7sWo4rEBhL/t9x+QyPhVvoX2SNCXEsw4="
},
"plasma-integration": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-integration-6.0.4.tar.xz",
"hash": "sha256-7vXCHuQ+76EDQSakXSs02pZ6+Bz5IanCpDFKT7JziRM="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-integration-6.0.5.tar.xz",
"hash": "sha256-f4FoP/j4puI9XJjps/O8PWOKvU3K1OQNJ0RsACkAT/A="
},
"plasma-mobile": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-mobile-6.0.4.tar.xz",
"hash": "sha256-XXFKfLWU5H6r7Z3ceqdfJGfQ0wLZG2a5SWarjMnEmvw="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-mobile-6.0.5.tar.xz",
"hash": "sha256-hx0BuUCuMPHjzxt0jWaoluRa473G1rHodfKMlWTwVpQ="
},
"plasma-nano": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-nano-6.0.4.tar.xz",
"hash": "sha256-WUy1C4CVPb7D135Rvmb765gy0D75543JLKR0e/sBb28="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-nano-6.0.5.tar.xz",
"hash": "sha256-F4dSBUjZukxoajwhuvM7pxdmGeYOcOjOvuymQcPFlgE="
},
"plasma-nm": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-nm-6.0.4.tar.xz",
"hash": "sha256-ZFGdnQX8tPhce5xHCMxvUQ4o/cJyttDip6HvwDiIxt8="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-nm-6.0.5.tar.xz",
"hash": "sha256-LFK3WpYe/Quf2e86bOtPS8U53p763DoMAIeZ12+U+Oc="
},
"plasma-pa": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-pa-6.0.4.tar.xz",
"hash": "sha256-MprRwyZ5hFm+qxReztQ+buliN42VKZwaZPWpKeq9pgE="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-pa-6.0.5.tar.xz",
"hash": "sha256-7L87tAcggJSByraFfnwbNDaKE50RYrAM1GssxjzZqsQ="
},
"plasma-sdk": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-sdk-6.0.4.tar.xz",
"hash": "sha256-a6LOS9QLdVTvMuw3VD+2JozDyx8WDZmfTPCWjf1Vseg="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-sdk-6.0.5.tar.xz",
"hash": "sha256-EeVgkilQMQvf9UmfibMWE9Tr4HBW7FeDuCYCsPm+jvs="
},
"plasma-systemmonitor": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-systemmonitor-6.0.4.tar.xz",
"hash": "sha256-rPWGChXXO3cn3cacJx/k3FbCcE2s86AuLHtUVon84kU="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-systemmonitor-6.0.5.tar.xz",
"hash": "sha256-ZiUY5tx2PRnL2HjBRaN2GmouJ2X9I3J4/90KKlJTCAs="
},
"plasma-thunderbolt": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-thunderbolt-6.0.4.tar.xz",
"hash": "sha256-WpcTdp20D5T9igq10I5eqhkHaN8W3+hIs5GjSDHYZh4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-thunderbolt-6.0.5.tar.xz",
"hash": "sha256-WZfeM874a3tsRK3Oai4dO7U2x9eqQ+HjUN0Ov3fLZlg="
},
"plasma-vault": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-vault-6.0.4.tar.xz",
"hash": "sha256-t5e1kynAJQn1i9D6l4zERP3tZ2o302yeT1xcbx7JDL4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-vault-6.0.5.tar.xz",
"hash": "sha256-L+PMc/e+9NTGR26gz9MuMl1bhx/fz/XBFB8gPd4L6U0="
},
"plasma-welcome": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-welcome-6.0.4.tar.xz",
"hash": "sha256-a8qHSddcujU+RYQuYofRki3NGM7UuK04aFhXC76cGFI="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-welcome-6.0.5.tar.xz",
"hash": "sha256-XChjJlDcoDD9mpNl28Vv4ImObUhjwkYlrW5QPBzCPsY="
},
"plasma-workspace": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-workspace-6.0.4.tar.xz",
"hash": "sha256-fywocclm5m1d4tY7yxpVT+ALTaa96T9pcAvRsfYNxWc="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.tar.xz",
"hash": "sha256-xU0tWt9esv7vcJK5IX8e1ZyY42n5tdexLddzZfTresk="
},
"plasma-workspace-wallpapers": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plasma-workspace-wallpapers-6.0.4.tar.xz",
"hash": "sha256-yLMIh5Nkdd5/DFzggG/gKt5VlM+Twc3pzbcvv7J2bxQ="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-wallpapers-6.0.5.tar.xz",
"hash": "sha256-fqtNNHNe3/oSIrK1X9JEjX9iNeReAKG/mpRQ1za1O/A="
},
"plasma5support": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma5support-6.0.5.tar.xz",
"hash": "sha256-ioEefbocMK4mKJNMTakdLfpC3JMihul9rIlwZGKHuHo="
},
"plymouth-kcm": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/plymouth-kcm-6.0.4.tar.xz",
"hash": "sha256-UC67u4joCIxgnBy14Hd6EQ6GSyVTvB1qM6PEjdMVaN4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plymouth-kcm-6.0.5.tar.xz",
"hash": "sha256-veWy0OMBjv2oB44yrqN0dTtOJRdxTJkUnl+Y0EbxJu8="
},
"polkit-kde-agent-1": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/polkit-kde-agent-1-6.0.4.tar.xz",
"hash": "sha256-4Py7ihz6uL5psnE7IQWwI1E3OB8f221GXDl45rhiayQ="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/polkit-kde-agent-1-6.0.5.tar.xz",
"hash": "sha256-cs+jZ/3UayyRduR80TB/LqccAgfy49zPBtKS3OTUSKk="
},
"powerdevil": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/powerdevil-6.0.4.tar.xz",
"hash": "sha256-F3O2IYGQmDHSTJFBo/3Y6WoJzwi9Q1qdmoYFlGsPJVk="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/powerdevil-6.0.5.tar.xz",
"hash": "sha256-J/mVvObyfjW3jgwjL43uj7pQ+5HXs6/RF1g723mhL9Q="
},
"print-manager": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/print-manager-6.0.4.tar.xz",
"hash": "sha256-QJJsrLZckMSd1HWPV7YGulcfSepm/0LAMcaf2+ciHAg="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/print-manager-6.0.5.tar.xz",
"hash": "sha256-V6wh/zTaLIxm9Hh43iwE0uoFOV8pd/yWxR3usEczozc="
},
"qqc2-breeze-style": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/qqc2-breeze-style-6.0.4.tar.xz",
"hash": "sha256-4dD5VqajzEqGHRs9Ie9JoeEYMGXINatTdo2fei/7kSw="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/qqc2-breeze-style-6.0.5.tar.xz",
"hash": "sha256-1PzFlkagZv05Kp7YZXGJ7sZ35yJJyKTnJH7YmrxHRJY="
},
"sddm-kcm": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/sddm-kcm-6.0.4.tar.xz",
"hash": "sha256-J5Wg1HqNdYZgAnS53GVuXo0fjWN+UCzEjMi8KNM9PTk="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/sddm-kcm-6.0.5.tar.xz",
"hash": "sha256-huWdNrSD+i70jYUDHG8Y8oaHvQ7otCOEsK4mwBSywCg="
},
"systemsettings": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/systemsettings-6.0.4.tar.xz",
"hash": "sha256-GMgBYjAIPY8uyY0zwBV3VgYMWhNuiZV2nb9+8ybEAu0="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/systemsettings-6.0.5.tar.xz",
"hash": "sha256-tyK6Ifq9jNJ+I3GoPjOppOFAMlfUVLPwHG+kbCh0z5M="
},
"wacomtablet": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/wacomtablet-6.0.4.tar.xz",
"hash": "sha256-hsxtxur7/UhEitBWggY1fVyoLb+cFHOz0VB8h3itlY4="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/wacomtablet-6.0.5.tar.xz",
"hash": "sha256-N8+dNHdReMoiPm2bM+iqwRmRO6ETFvS8Imkk4lOXDK8="
},
"xdg-desktop-portal-kde": {
"version": "6.0.4",
"url": "mirror://kde/stable/plasma/6.0.4/xdg-desktop-portal-kde-6.0.4.tar.xz",
"hash": "sha256-keVaeU8A/bdTBe0F9yoc4xDiKLEViG9yRxRzycfIiWA="
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/xdg-desktop-portal-kde-6.0.5.tar.xz",
"hash": "sha256-AL30QtN7MICr/SlYQl3XJKOlAZ1Q39fLMZ5RYLJ6awU="
}
}

View File

@ -1,9 +1,21 @@
{
mkKdeDerivation,
fetchFromGitLab,
sources,
shared-mime-info,
}:
mkKdeDerivation {
mkKdeDerivation rec {
pname = "bluedevil";
# Upstream tarball is broken, so fetch from Invent temporarily.
# FIXME: remove in next release.
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "plasma";
repo = "bluedevil";
rev = "v${sources.${pname}.version}";
hash = "sha256-3scHXPZ6dSWa2yea89R1u4jbkr6IFP6jvTLEC4O5uYY=";
};
extraNativeBuildInputs = [shared-mime-info];
}

View File

@ -32417,56 +32417,49 @@ with pkgs;
libreoffice-unwrapped = libreoffice.unwrapped;
libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress;
zip = zip.override { enableNLS = false; };
fontsConf = makeFontsConf {
fontDirectories = [
carlito dejavu_fonts
freefont_ttf xorg.fontmiscmisc
liberation_ttf_v1
liberation_ttf_v2
];
};
clucene_core = clucene_core_2;
lcms = lcms2;
harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true;
};
boost = boost179;
};
libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = libsForQt5.callPackage ../applications/office/libreoffice
(libreoffice-args // {
kdeIntegration = true;
variant = "fresh";
});
unwrapped = libsForQt5.callPackage ../applications/office/libreoffice {
kdeIntegration = true;
variant = "fresh";
};
});
libreoffice-qt-fresh-unwrapped = libreoffice-qt-fresh.unwrapped;
libreoffice-qt-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = libsForQt5.callPackage ../applications/office/libreoffice
(libreoffice-args // {
kdeIntegration = true;
variant = "still";
});
unwrapped = libsForQt5.callPackage ../applications/office/libreoffice {
kdeIntegration = true;
variant = "still";
};
});
libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped;
libreoffice-qt6-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
kdeIntegration = true;
variant = "fresh";
};
});
libreoffice-qt6-fresh-unwrapped = libreoffice-qt6-fresh.unwrapped;
libreoffice-qt6-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = kdePackages.callPackage ../applications/office/libreoffice {
kdeIntegration = true;
variant = "still";
};
});
libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped;
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = callPackage ../applications/office/libreoffice
(libreoffice-args // {
variant = "fresh";
});
unwrapped = callPackage ../applications/office/libreoffice {
variant = "fresh";
};
});
libreoffice-fresh-unwrapped = libreoffice-fresh.unwrapped;
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
unwrapped = callPackage ../applications/office/libreoffice
(libreoffice-args // {
variant = "still";
});
unwrapped = callPackage ../applications/office/libreoffice {
variant = "still";
};
});
libreoffice-still-unwrapped = libreoffice-still.unwrapped;