Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-04-03 18:01:23 +00:00 committed by GitHub
commit 6ed8718f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 398 additions and 393 deletions

View File

@ -205,6 +205,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `baget` package and module was removed due to being unmaintained.
- `go-ethereum` package has been updated to v1.11.5 and the `puppeth` command is no longer available as of v1.11.0.
## Other Notable Changes {#sec-release-23.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.26";
version = "1.11.5";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eefQEOeKb6gZIJdK9cq20WnhwZE1qbyd8Cl0Hqh2+u8=";
sha256 = "sha256-QFqPAWW0L9cSBvnDwJKtwWT2jZFyr+zhYaS+GF/nQ9g=";
};
vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0=";
vendorSha256 = "sha256-Y1srOcXZ4rQ0QIQx4LdYzYG6goGk6oO30C+OW+s81z4=";
doCheck = false;
@ -41,12 +41,11 @@ in buildGoModule rec {
"cmd/faucet"
"cmd/geth"
"cmd/p2psim"
"cmd/puppeth"
"cmd/rlpdump"
"cmd/utils"
];
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.26/build/ci.go#L218
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.5/build/ci.go#L218
tags = [ "urfave_cli_no_docs" ];
# Fix for usb-related segmentation faults on darwin

View File

@ -73,9 +73,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "8.3";
version = "8.5";
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
hash = "sha256-QQJpAAKSw7+t0lYf3eBtm8sryVi0mwPpY/FBd6J2MfA=";
hash = "sha256-wJdmQBswu0JeEy4RSyba+kJ2SX5AzL4V+3fnUfsJvhc=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
@ -105,7 +105,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
hash = "sha256-b49WFyiEbkJFUp1n9rz+A1c6iseSfV+5DrpA6AwKa+4=";
hash = "sha256-vHV7x2U9B4P0E4tcQuMXHSS4NqN7rlnhC6v/t+0Qlh0=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View File

@ -0,0 +1,39 @@
{ lib
, fetchFromGitHub
, stdenv
, rustPlatform
, pkg-config
, openssl
, libgit2
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "klipper-estimator";
version = "3.2.1";
src = fetchFromGitHub {
owner = "Annex-Engineering";
repo = "klipper_estimator";
rev = "v${version}";
hash = "sha256-0QDEaRJpjiE7aH6PpessCGUe4TT31FhsxTFw7OglPUc=";
};
cargoHash = "sha256-W0Vo4bA2QNfzBqcZiblf6eJnQ3cRgrnNELzS9O1O6bU=";
buildInputs =
[ openssl ]
++ lib.optional stdenv.isDarwin [ libgit2 Security ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Tool for determining the time a print will take using the Klipper firmware";
homepage = "https://github.com/Annex-Engineering/klipper_estimator";
changelog = "https://github.com/Annex-Engineering/klipper_estimator/releases/tag/v${version}";
mainProgram = "klipper_estimator";
license = licenses.mit;
maintainers = with maintainers; [ tmarkus ];
};
}

View File

@ -1,14 +1,15 @@
{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5
, openldap, libxcrypt
{ lib, stdenv, fetchgit, ncurses, tcl, openssl, pam, libkrb5
, openldap, libxcrypt, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "alpine";
version = "2.25";
version = "2.26";
src = fetchurl {
url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz";
sha256 = "0xppxhcbafq9qa1rns5zl0n238gai08xhvcf2as0nx7nh84ib2k5";
src = fetchgit {
url = "https://repo.or.cz/alpine.git";
rev = "v${version}";
hash = "sha256-cJyUBatQBjD6RG+jesJ0JRhWghPRBACc/HQl+2aCTd0=";
};
buildInputs = [
@ -23,11 +24,13 @@ stdenv.mkDerivation rec {
"--with-c-client-target=slx"
];
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
description = "Console mail reader";
license = licenses.asl20;
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ raskin rhendric ];
platforms = platforms.linux;
homepage = "http://alpine.x10host.com/";
homepage = "https://alpineapp.email/";
};
}

View File

@ -192,8 +192,6 @@ in
inherit (primary-src) src;
outputs = [ "out" "dev" ];
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
@ -216,9 +214,6 @@ in
tar -xf ${srcs.translations}
'';
patches = optionals (variant == "still") [ ./skip-failed-test-with-icu70.patch ./gpgme-1.18.patch ]
;
### QT/KDE
#
# configure.ac assumes that the first directory that contains headers and
@ -352,6 +347,10 @@ in
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 /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_sdext_pdfimport/d -i sdext/Module_sdext.mk
sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.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"
@ -386,9 +385,6 @@ in
cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
mkdir -p $dev
cp -r include $dev
'';
# Wrapping is done in ./wrapper.nix
@ -449,6 +445,8 @@ in
"--without-system-libstaroffice"
"--without-system-libepubgen"
"--without-system-libqxp"
"--without-system-dragonbox"
"--without-system-libfixmath"
"--with-system-mdds"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus"

View File

@ -201,7 +201,7 @@ def parse_line(line):
if re.match('\s*(#.*)?$', line):
return 'nothing'
match = re.match('\s*export\s+([^:\s]+)\s*:=\s*(.*)$', line)
match = re.match('([^:\s]+)\s*:=\s*(.*)$', line)
if match:
return {

View File

@ -7,11 +7,11 @@
md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
}
{
name = "boost_1_79_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz";
sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc";
name = "boost_1_80_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_80_0.tar.xz";
sha256 = "322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666";
md5 = "";
md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz";
md5name = "322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666-boost_1_80_0.tar.xz";
}
{
name = "box2d-2.4.1.tar.gz";
@ -63,11 +63,11 @@
md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
}
{
name = "dragonbox-1.1.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.0.tar.gz";
sha256 = "293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20";
name = "dragonbox-1.1.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz";
sha256 = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384";
md5 = "";
md5name = "293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20-dragonbox-1.1.0.tar.gz";
md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz";
}
{
name = "dtoa-20180411.tgz";
@ -98,11 +98,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-7.85.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.85.0.tar.xz";
sha256 = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6";
name = "curl-8.0.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz";
sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0";
md5 = "";
md5name = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6-curl-7.85.0.tar.xz";
md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -112,11 +112,11 @@
md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
name = "libepoxy-1.5.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz";
sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4";
name = "libepoxy-1.5.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz";
sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15";
md5 = "";
md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz";
md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz";
}
{
name = "epm-3.7.tar.gz";
@ -140,11 +140,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.4.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz";
sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354";
name = "expat-2.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.5.0.tar.xz";
sha256 = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe";
md5 = "";
md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz";
md5name = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe-expat-2.5.0.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -209,13 +209,6 @@
md5 = "e7a384790b13c29113e22e596ade9687";
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f";
md5 = "907d6e99f241876695c19ff3db0b8923";
md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
}
{
name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
@ -223,20 +216,6 @@
md5 = "edc4d741888bc0d38e32dbaa17149596";
md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
}
{
name = "source-serif-pro-3.000R.tar.gz";
url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3";
md5 = "";
md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz";
}
{
name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz";
sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7";
md5 = "";
md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
}
{
name = "noto-fonts-20171024.tar.gz";
url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
@ -266,18 +245,11 @@
md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
}
{
name = "Amiri-0.117.zip";
url = "https://dev-www.libreoffice.org/src/Amiri-0.117.zip";
sha256 = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7";
name = "Amiri-1.000.zip";
url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip";
sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30";
md5 = "";
md5name = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7-Amiri-0.117.zip";
}
{
name = "ttf-kacst_2.01+mry.tar.gz";
url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
md5 = "";
md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip";
}
{
name = "ReemKufi-1.2.zip";
@ -301,11 +273,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.11.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.11.1.tar.xz";
sha256 = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8";
name = "freetype-2.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz";
sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033";
md5 = "";
md5name = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8-freetype-2.11.1.tar.xz";
md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz";
}
{
name = "glm-0.9.9.8.zip";
@ -315,11 +287,11 @@
md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip";
}
{
name = "gpgme-1.16.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2";
sha256 = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0";
name = "gpgme-1.18.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.18.0.tar.bz2";
sha256 = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e";
md5 = "";
md5name = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0-gpgme-1.16.0.tar.bz2";
md5name = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e-gpgme-1.18.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@ -329,11 +301,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-4.3.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz";
sha256 = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530";
name = "harfbuzz-5.2.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-5.2.0.tar.xz";
sha256 = "735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c";
md5 = "";
md5name = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530-harfbuzz-4.3.0.tar.xz";
md5name = "735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c-harfbuzz-5.2.0.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@ -343,11 +315,11 @@
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
name = "hunspell-1.7.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz";
sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951";
name = "hunspell-1.7.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz";
sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8";
md5 = "";
md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz";
md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
@ -357,18 +329,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-71_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz";
sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf";
name = "icu4c-72_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-72_1-src.tgz";
sha256 = "a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68";
md5 = "";
md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz";
md5name = "a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68-icu4c-72_1-src.tgz";
}
{
name = "icu4c-71_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip";
sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804";
name = "icu4c-72_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-72_1-data.zip";
sha256 = "ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea";
md5 = "";
md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip";
md5name = "ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea-icu4c-72_1-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@ -448,11 +420,11 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
name = "libjpeg-turbo-2.1.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz";
sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5";
name = "libjpeg-turbo-2.1.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.tar.gz";
sha256 = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf";
md5 = "";
md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz";
md5name = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf-libjpeg-turbo-2.1.5.tar.gz";
}
{
name = "language-subtag-registry-2022-08-08.tar.bz2";
@ -518,11 +490,11 @@
md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2";
}
{
name = "libnumbertext-1.0.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz";
sha256 = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb";
name = "libnumbertext-1.0.11.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.11.tar.xz";
sha256 = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0";
md5 = "";
md5name = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb-libnumbertext-1.0.10.tar.xz";
md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz";
}
{
name = "ltm-1.0.zip";
@ -539,18 +511,18 @@
md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz";
}
{
name = "xmlsec1-1.2.34.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz";
sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262";
name = "xmlsec1-1.2.37.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz";
sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c";
md5 = "";
md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz";
md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz";
}
{
name = "libxml2-2.10.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.10.2.tar.xz";
sha256 = "d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265";
name = "libxml2-2.10.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz";
sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c";
md5 = "";
md5name = "d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265-libxml2-2.10.2.tar.xz";
md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz";
}
{
name = "libxslt-1.1.35.tar.xz";
@ -609,18 +581,18 @@
md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz";
}
{
name = "mythes-1.2.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f";
md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6";
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
name = "mythes-1.2.5.tar.xz";
url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz";
sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d";
md5 = "";
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.83-with-nspr-4.34.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz";
sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30";
name = "nss-3.88.1-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz";
sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a";
md5 = "";
md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz";
md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@ -651,11 +623,11 @@
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
}
{
name = "openssl-1.1.1q.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz";
sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
name = "openssl-3.0.8.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.8.tar.gz";
sha256 = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e";
md5 = "";
md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz";
md5name = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e-openssl-3.0.8.tar.gz";
}
{
name = "liborcus-0.17.2.tar.bz2";
@ -672,39 +644,39 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-5058.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2";
sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac";
name = "pdfium-5408.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2";
sha256 = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35";
md5 = "";
md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2";
md5name = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35-pdfium-5408.tar.bz2";
}
{
name = "pixman-0.40.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz";
sha256 = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc";
name = "pixman-0.42.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz";
sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e";
md5 = "";
md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz";
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.37.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca";
name = "libpng-1.6.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz";
sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937";
md5 = "";
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz";
}
{
name = "tiff-4.4.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.4.0.tar.xz";
sha256 = "49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1";
name = "tiff-4.5.0rc3.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz";
sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c";
md5 = "";
md5name = "49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1-tiff-4.4.0.tar.xz";
md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz";
}
{
name = "poppler-22.09.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz";
sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e";
name = "poppler-22.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz";
sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0";
md5 = "";
md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz";
md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz";
}
{
name = "poppler-data-0.4.11.tar.gz";
@ -714,18 +686,18 @@
md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz";
}
{
name = "postgresql-13.5.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
name = "postgresql-13.10.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2";
sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2";
md5 = "";
md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2";
}
{
name = "Python-3.8.14.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.14.tar.xz";
sha256 = "5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3";
name = "Python-3.8.16.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz";
sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562";
md5 = "";
md5name = "5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3-Python-3.8.14.tar.xz";
md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -797,13 +769,6 @@
md5 = "";
md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
}
{
name = "ucpp-1.3.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776";
md5 = "0168229624cfac409e766913506961a8";
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
}
{
name = "libvisio-0.1.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
@ -840,11 +805,11 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.2.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz";
sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18";
name = "zlib-1.2.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz";
sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98";
md5 = "";
md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz";
md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz";
}
{
name = "libzmf-0.0.2.tar.xz";
@ -854,10 +819,10 @@
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
{
name = "zxing-cpp-1.2.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz";
sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a";
name = "zxing-cpp-1.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.4.0.tar.gz";
sha256 = "126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862";
md5 = "";
md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz";
md5name = "126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862-zxing-cpp-1.4.0.tar.gz";
}
]

View File

@ -1,15 +1,15 @@
{ fetchurl }:
rec {
fetchSrc = {name, sha256}: fetchurl {
fetchSrc = {name, hash}: fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
sha256 = hash;
};
major = "7";
minor = "4";
minor = "5";
patch = "2";
tweak = "3";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
hash = "sha256-gsH/4C8u2O4UUan2fDUzWyemONtZH5vFOe/4arFN2Vo=";
hash = "sha256-YYuQfdNrj4DgfdwTpgXo58EhJh323cmmQ24FQUMkLdM=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "sha256-yAU/hjyVwxqDoHm7Lu/Ztmb/1Z5AxDRAmMBKkkpU9uE=";
hash = "sha256-IPdXQibM+xz1Wok/XnRxyNVqvwh4BarWCH9FceylN/0=";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "sha256-T57V3Z2LOUvkQt24b1fLeHRigtiG4Nw1rdNuizQXD1w=";
hash = "sha256-h1uQ3EaroSyz6uCU7SFC06TuGMvaXm97/v9zCKvNxDY=";
};
}

View File

@ -7,32 +7,18 @@
md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
}
{
name = "apr-1.5.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz";
sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb";
name = "boost_1_79_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz";
sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc";
md5 = "";
md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz";
md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz";
}
{
name = "apr-util-1.5.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz";
sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19";
name = "box2d-2.4.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz";
sha256 = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2";
md5 = "";
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
}
{
name = "boost_1_77_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_77_0.tar.xz";
sha256 = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e";
md5 = "";
md5name = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e-boost_1_77_0.tar.xz";
}
{
name = "box2d-2.3.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz";
sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c";
md5 = "";
md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";
md5name = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2-box2d-2.4.1.tar.gz";
}
{
name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz";
@ -56,11 +42,11 @@
md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz";
}
{
name = "cairo-1.17.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz";
sha256 = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705";
name = "cairo-1.17.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz";
sha256 = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf";
md5 = "";
md5name = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705-cairo-1.17.4.tar.xz";
md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz";
}
{
name = "libcdr-0.1.7.tar.xz";
@ -76,6 +62,13 @@
md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz";
}
{
name = "dragonbox-1.1.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz";
sha256 = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384";
md5 = "";
md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz";
}
{
name = "dtoa-20180411.tgz";
url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";
@ -105,18 +98,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "converttexttonumber-1-5-0.oxt";
url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3";
md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.86.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz";
sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b";
name = "curl-7.88.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.88.1.tar.xz";
sha256 = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f";
md5 = "";
md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz";
md5name = "1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f-curl-7.88.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -154,11 +140,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.4.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz";
sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354";
name = "expat-2.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.5.0.tar.xz";
sha256 = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe";
md5 = "";
md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz";
md5name = "ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe-expat-2.5.0.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -315,11 +301,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.11.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz";
sha256 = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7";
name = "freetype-2.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz";
sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033";
md5 = "";
md5name = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7-freetype-2.11.0.tar.xz";
md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz";
}
{
name = "glm-0.9.9.8.zip";
@ -329,11 +315,11 @@
md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip";
}
{
name = "gpgme-1.16.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2";
sha256 = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0";
name = "gpgme-1.18.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.18.0.tar.bz2";
sha256 = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e";
md5 = "";
md5name = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0-gpgme-1.16.0.tar.bz2";
md5name = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e-gpgme-1.18.0.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@ -343,11 +329,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-2.8.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-2.8.2.tar.xz";
sha256 = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7";
name = "harfbuzz-4.3.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-4.3.0.tar.xz";
sha256 = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530";
md5 = "";
md5name = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7-harfbuzz-2.8.2.tar.xz";
md5name = "a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530-harfbuzz-4.3.0.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@ -371,18 +357,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
}
{
name = "icu4c-70_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-70_1-src.tgz";
sha256 = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5";
name = "icu4c-71_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz";
sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf";
md5 = "";
md5name = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5-icu4c-70_1-src.tgz";
md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz";
}
{
name = "icu4c-70_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-70_1-data.zip";
sha256 = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e";
name = "icu4c-71_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip";
sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804";
md5 = "";
md5name = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e-icu4c-70_1-data.zip";
md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip";
}
{
name = "flow-engine-0.9.4.zip";
@ -462,25 +448,18 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
name = "libjpeg-turbo-2.1.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz";
sha256 = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4";
name = "libjpeg-turbo-2.1.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz";
sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5";
md5 = "";
md5name = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4-libjpeg-turbo-2.1.1.tar.gz";
md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz";
}
{
name = "language-subtag-registry-2021-12-29.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2";
sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837";
name = "language-subtag-registry-2022-08-08.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2";
sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00";
md5 = "";
md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d";
md5 = "b63e6340a02ff1cacfeadb2c42286161";
md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2";
}
{
name = "lcms2-2.12.tar.gz";
@ -539,11 +518,11 @@
md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2";
}
{
name = "libnumbertext-1.0.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz";
sha256 = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb";
name = "libnumbertext-1.0.11.tar.xz";
url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.11.tar.xz";
sha256 = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0";
md5 = "";
md5name = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb-libnumbertext-1.0.10.tar.xz";
md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz";
}
{
name = "ltm-1.0.zip";
@ -553,11 +532,18 @@
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
}
{
name = "xmlsec1-1.2.33.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.33.tar.gz";
sha256 = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931";
name = "libwebp-1.2.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz";
sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df";
md5 = "";
md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz";
md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz";
}
{
name = "xmlsec1-1.2.34.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz";
sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262";
md5 = "";
md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz";
}
{
name = "libxml2-2.10.3.tar.xz";
@ -630,18 +616,11 @@
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
}
{
name = "neon-0.31.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz";
sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678";
name = "nss-3.88.1-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz";
sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a";
md5 = "";
md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
}
{
name = "nss-3.83-with-nspr-4.34.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz";
sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30";
md5 = "";
md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz";
md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@ -672,11 +651,11 @@
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
}
{
name = "openssl-1.1.1q.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz";
sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
name = "openssl-1.1.1t.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz";
sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b";
md5 = "";
md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz";
md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz";
}
{
name = "liborcus-0.17.2.tar.bz2";
@ -693,32 +672,39 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-4699.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4699.tar.bz2";
sha256 = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf";
name = "pdfium-5058.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2";
sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac";
md5 = "";
md5name = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf-pdfium-4699.tar.bz2";
md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2";
}
{
name = "pixman-0.40.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz";
sha256 = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc";
name = "pixman-0.42.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz";
sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e";
md5 = "";
md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz";
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.38.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz";
sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be";
name = "libpng-1.6.39.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz";
sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937";
md5 = "";
md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz";
md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz";
}
{
name = "poppler-22.09.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz";
sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e";
name = "tiff-4.5.0rc3.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz";
sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c";
md5 = "";
md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz";
md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz";
}
{
name = "poppler-22.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz";
sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0";
md5 = "";
md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz";
}
{
name = "poppler-data-0.4.11.tar.gz";
@ -728,18 +714,18 @@
md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz";
}
{
name = "postgresql-13.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2";
sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded";
name = "postgresql-13.10.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2";
sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2";
md5 = "";
md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2";
md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2";
}
{
name = "Python-3.8.15.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz";
sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550";
name = "Python-3.8.16.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz";
sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562";
md5 = "";
md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz";
md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -784,18 +770,11 @@
md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
}
{
name = "serf-1.3.9.tar.bz2";
url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2";
sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc";
name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9";
md5 = "";
md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2";
}
{
name = "skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz";
sha256 = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177";
md5 = "";
md5name = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177-skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz";
md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";

View File

@ -1,14 +1,14 @@
{ fetchurl }:
rec {
fetchSrc = {name, sha256}: fetchurl {
fetchSrc = {name, hash}: fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
inherit sha256;
inherit hash;
};
major = "7";
minor = "3";
patch = "7";
minor = "4";
patch = "6";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls=";
hash = "sha256-GHOuiYbww/DSK/DpSqAaB/jgppKacjGSYIOPqGnmIJM=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk=";
hash = "sha256-ES4r9Pk7DYeFTPg8iPXQP84SpGn6x8G10Pfs1WQVixM=";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA=";
hash = "sha256-o0JnybhmMFZhcbTrWRllJ+J9+tcUbFLcbftymgECT9E=";
};
}

View File

@ -132,13 +132,12 @@ rec {
, destination ? "" # relative path appended to $out eg "/bin/foo"
, checkPhase ? "" # syntax checks, e.g. for scripts
, meta ? { }
, allowSubstitutes ? false
, preferLocalBuild ? true
}:
runCommand name
{ inherit text executable checkPhase meta;
{ inherit text executable checkPhase meta allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ];
# Pointless to do this on a remote machine.
preferLocalBuild = true;
allowSubstitutes = false;
}
''
target=$out${lib.escapeShellArg destination}
@ -324,6 +323,8 @@ rec {
inherit name;
executable = true;
destination = "/bin/${name}";
allowSubstitutes = true;
preferLocalBuild = false;
text = ''
#!${runtimeShell}
set -o errexit

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pipdeptree";
version = "2.5.0";
version = "2.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tox-dev";
repo = "pipdeptree";
rev = "refs/tags/${version}";
hash = "sha256-hAODK7kFCntfKC77VF/KyTk0O/z+bXHixVxQIz8JuDk=";
hash = "sha256-M9Vr7VZJ/nVd3xgfDBIjgQHhJB2QgJgB9ED7p7fRuA8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -126,13 +126,13 @@ let
in
stdenv.mkDerivation rec {
pname = "hydra";
version = "2022-12-23";
version = "2023-03-27";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "f48f00ee6d5727ae3e488cbf9ce157460853fea8";
sha256 = "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=";
rev = "082495e34e094cae1eb49dbfc5648938e23c6355";
sha256 = "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0=";
};
buildInputs = [

View File

@ -4,15 +4,15 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "26ea676b8d0d617b8fd0b2655e41e01fcb6e3447",
"sha256": "sha256-81V8XMbxV05wMCTDh0SGcZPdBmJj1oJYobpaOyDBmME=",
"version": "unstable-2023-03-15"
"rev": "9e82e6fc1ba161245d1e36bc8422d94ec9b16829",
"sha256": "sha256-1GtW9VAImH/iX8Q46oX9rNvnOcYr/0El0baljY47an8=",
"version": "unstable-2023-03-31"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
"version": "2.18.1"
},
"videojs": {
"sha256": "0zj8fgxdg6jsllaxn795xipa6yxh4yf08hb8x0idyg74q37gfh4c"
"sha256": "0m09pc9acpzhfwwvc9dayl60nn28skmmglgvmlp48dlkqgfbgc27"
}
}

View File

@ -10,3 +10,4 @@ gem 'fluent-plugin-mongo'
gem 'fluent-plugin-webhdfs'
gem 'fluent-plugin-rewrite-tag-filter'
gem 'fluent-plugin-cloudwatch-logs'
gem 'fluent-plugin-concat'

View File

@ -4,29 +4,29 @@ GEM
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
aws-eventstream (1.2.0)
aws-partitions (1.661.0)
aws-sdk-cloudwatchlogs (1.56.0)
aws-partitions (1.677.0)
aws-sdk-cloudwatchlogs (1.58.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.167.0)
aws-sdk-core (3.168.4)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-firehose (1.49.0)
aws-sdk-firehose (1.50.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.42.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.59.0)
aws-sdk-kms (1.61.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.117.1)
aws-sdk-s3 (1.117.2)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sdk-sqs (1.52.0)
aws-sdk-sqs (1.52.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
@ -39,12 +39,12 @@ GEM
elastic-transport (8.1.0)
faraday (< 3)
multi_json
elasticsearch (8.5.1)
elasticsearch (8.5.2)
elastic-transport (~> 8)
elasticsearch-api (= 8.5.1)
elasticsearch-api (8.5.1)
elasticsearch-api (= 8.5.2)
elasticsearch-api (8.5.2)
multi_json
excon (0.94.0)
excon (0.95.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@ -73,6 +73,8 @@ GEM
fluent-plugin-cloudwatch-logs (0.14.3)
aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 1.8.0)
fluent-plugin-concat (2.5.0)
fluentd (>= 0.14.0, < 2)
fluent-plugin-elasticsearch (5.2.4)
elasticsearch
excon
@ -114,16 +116,16 @@ GEM
tzinfo-data (~> 1.0)
webrick (>= 1.4.2, < 1.8.0)
yajl-ruby (~> 1.0)
google-protobuf (3.21.9)
google-protobuf (3.21.12)
http_parser.rb (0.8.0)
jmespath (1.6.1)
jmespath (1.6.2)
ltsv (0.1.2)
mongo (2.18.1)
mongo (2.18.2)
bson (>= 4.14.1, < 5.0.0)
msgpack (1.6.0)
multi_json (1.15.0)
multipart-post (2.2.3)
public_suffix (5.0.0)
public_suffix (5.0.1)
rake (13.0.6)
ruby-kafka (1.5.0)
digest-crc
@ -134,7 +136,7 @@ GEM
strptime (0.2.5)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.6)
tzinfo-data (1.2022.7)
tzinfo (>= 1.0.0)
webhdfs (0.10.2)
addressable
@ -146,6 +148,7 @@ PLATFORMS
DEPENDENCIES
fluent-plugin-cloudwatch-logs
fluent-plugin-concat
fluent-plugin-elasticsearch
fluent-plugin-kafka
fluent-plugin-kinesis
@ -157,4 +160,4 @@ DEPENDENCIES
fluentd
BUNDLED WITH
2.3.24
2.3.26

View File

@ -1,4 +1,4 @@
{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
{ lib, bundlerEnv, ruby, bundlerUpdateScript, nixosTests }:
bundlerEnv {
inherit ruby;
@ -7,6 +7,7 @@ bundlerEnv {
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "fluentd";
passthru.tests.fluentd = nixosTests.fluentd;
meta = with lib; {
description = "A data collector";

View File

@ -25,10 +25,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15bw7jm2n7kxjz65amg9s837zlxsf98fn6wf6x20ngz1x4i8n0j6";
sha256 = "1c6w07lm5ssn0v06sh90g3swqb42ma65pfz0qlk3hqlj1fs5zd9b";
type = "gem";
};
version = "1.661.0";
version = "1.677.0";
};
aws-sdk-cloudwatchlogs = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iy8r65hwqlqaifhv7yxwapizrf02ch800xl90i9vg9293p5545w";
sha256 = "0yhwbr3g9brh7g8vjxygfvhlc9sa04g5bzyhkdcdkl7faqpy93z3";
type = "gem";
};
version = "1.56.0";
version = "1.58.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc";
type = "gem";
};
version = "3.167.0";
version = "3.168.4";
};
aws-sdk-firehose = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vhrld6gpa8idw51qfpvy2d624jbwmvickpfr8bnb4a5b06im80a";
sha256 = "02lznpqdmla1i5ilxn6kkbdwasl2w4m9ml09whig9wwrlwjfkdnm";
type = "gem";
};
version = "1.49.0";
version = "1.50.0";
};
aws-sdk-kinesis = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -80,10 +80,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy";
type = "gem";
};
version = "1.59.0";
version = "1.61.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -91,10 +91,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91";
type = "gem";
};
version = "1.117.1";
version = "1.117.2";
};
aws-sdk-sqs = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -102,10 +102,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jf878ncdkxz3z507pa2fl47h2a9yvi01cx2pg3camqmal1nd1x7";
sha256 = "1hirj20g7nnyf0xhxwvgfl12nypm1r5id16ccc8y1rbasclxs897";
type = "gem";
};
version = "1.52.0";
version = "1.52.1";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -176,10 +176,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19jbvm6rzm19vzd3d83icchs0l4qgh7kp3cfi4pd2lcfiy635qil";
sha256 = "0mwrf667p3n0xdashlk3m66a7vcqsg4vnr5icm7jgdd71qr4yvds";
type = "gem";
};
version = "8.5.1";
version = "8.5.2";
};
elasticsearch-api = {
dependencies = ["multi_json"];
@ -187,20 +187,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00b6lhfs4r9jp3dkphly9qqyyrd7sx4s1186kcjf8zhsxyq0m310";
sha256 = "138s5rcy5j63sjf6k8av8gaxn46nh8nf1bwxyxfygyy3q2q9m4vs";
type = "gem";
};
version = "8.5.1";
version = "8.5.2";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby";
type = "gem";
};
version = "0.94.0";
version = "0.95.0";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@ -336,6 +336,17 @@
};
version = "0.14.3";
};
fluent-plugin-concat = {
dependencies = ["fluentd"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b9z6hrjcsvccfimmgczzcbhvf2zwyqzvsdc29i2biqhk1mcwn3k";
type = "gem";
};
version = "2.5.0";
};
fluent-plugin-elasticsearch = {
dependencies = ["elasticsearch" "excon" "faraday" "fluentd"];
groups = ["default"];
@ -440,10 +451,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras";
sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
type = "gem";
};
version = "3.21.9";
version = "3.21.12";
};
"http_parser.rb" = {
groups = ["default"];
@ -460,10 +471,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
type = "gem";
};
version = "1.6.1";
version = "1.6.2";
};
ltsv = {
groups = ["default"];
@ -481,10 +492,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16dzacmhz4g4n4kmw9qfg7hjh4xj71rzb7nd7n8vl1788x9h3sp5";
sha256 = "1ldpcyqhgvdn7rd1vdbv2n3xnr6ajw7964yb9gr44nv7z35fd7kn";
type = "gem";
};
version = "2.18.1";
version = "2.18.2";
};
msgpack = {
groups = ["default"];
@ -521,10 +532,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
type = "gem";
};
version = "5.0.0";
version = "5.0.1";
};
rake = {
groups = ["default"];
@ -605,10 +616,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dpwi70x9jrpvc7p103ci0kppam79wqqrskq9n39r3jrp4b4j27w";
sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp";
type = "gem";
};
version = "1.2022.6";
version = "1.2022.7";
};
webhdfs = {
dependencies = ["addressable"];

View File

@ -34,7 +34,6 @@ buildGoModule rec {
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Make remote development work with your local tools";
homepage = "https://mutagen.io/";
changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "home-manager";
version = "2022-10-25";
version = "2023-04-02";
src = fetchFromGitHub {
owner = "nix-community";
repo = "home-manager";
rev = "7dc4e4ebd71280842b4d30975439980baaac9db8";
sha256 = "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I=";
rev = "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8";
sha256 = "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -6,7 +6,7 @@ in
buildGoModule rec {
pname = "chroma";
version = "2.4.0";
version = "2.7.0";
# To update:
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@ -17,7 +17,7 @@ buildGoModule rec {
inherit (srcInfo) sha256;
};
vendorSha256 = "02malb9qilixhdjrdd8bf0yml1c2rkvfvdmr25b4xdv0vwvgb9gg";
vendorSha256 = "0kw53983bjrmh9nk2xcv4d9104krxnc1jh1g44xjmaq8i6f3q0k1";
modRoot = "./cmd/chroma";

View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/alecthomas/chroma.git",
"rev": "aecedef97da5c01d46cd3c8b427df5aae92b3089",
"date": "2022-11-15T18:57:46+11:00",
"path": "/nix/store/fnwldb1pkdws3rqj7y4cs1rk93ar6kqr-chroma",
"sha256": "0l5x256d6v1089ww8cxhd6bwav58rbwj76av2x1vld3n3w4j3148",
"rev": "b9e37581208ea7d7f167c59e6f635721617c381b",
"date": "2023-03-21T13:55:45+11:00",
"path": "/nix/store/52c919gjqdwva73ajwz11iv5gg18vi8y-chroma",
"sha256": "0i4ck23gn0v7x6r8wa2k7qiwhxpxqqnaknb9iy9rz8pjcj14ai75",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View File

@ -5159,6 +5159,10 @@ with pkgs;
klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { };
klipper-estimator = callPackage ../applications/misc/klipper-estimator {
inherit (darwin.apple_sdk.frameworks) Security;
};
klog = qt5.callPackage ../applications/radio/klog { };
komga = callPackage ../servers/komga { };
@ -20690,7 +20694,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc { };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_11; };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_13; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli {
openssl = openssl_1_1;