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

Merge 1b6c7982dd into haskell-updates

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-04-06 00:33:23 +00:00
committed by GitHub
parent 99c25fb2e6 1b6c7982dd
commit 39a77b8312
395 changed files with 9314 additions and 4288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/go.section.md
+1
View File
@@ -101,6 +101,7 @@ If `true`, the intermediate fetcher downloads dependencies from the
This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or
if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums.
It may also be needed if the module targets language version 1.16 or earlier, since vendoring compiles all dependencies against language version 1.16 in this case.
Defaults to `false`.
doc/release-notes/rl-2605.section.md
+2
View File
@@ -323,3 +323,5 @@ gnuradioMinimal.override {
### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements}
- The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.
- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.
nixos/modules/system/service/portable/config-data-item.nix → lib/services/config-data-item.nix
+1 -1
View File
@@ -1,4 +1,4 @@
# Tests in: ../../../../tests/modular-service-etc/test.nix
# Tests in: ../../nixos/tests/modular-service-etc/test.nix
# This file is a function that returns a module.
pkgs:
{
nixos/modules/system/service/portable/config-data.nix → lib/services/config-data.nix
+1 -1
View File
@@ -1,4 +1,4 @@
# Tests in: ../../../../tests/modular-service-etc/test.nix
# Tests in: ../../nixos/tests/modular-service-etc/test.nix
# Non-modular context provided by the modular services integration.
{ pkgs }:
nixos/modules/system/service/portable/lib.nix → lib/services/lib.nix
View File
nixos/modules/system/service/portable/service.nix → lib/services/service.nix
+2 -2
View File
@@ -16,8 +16,8 @@ in
# https://nixos.org/manual/nixos/unstable/#modular-services
_class = "service";
imports = [
../../../../../modules/generic/meta-maintainers.nix
../../../misc/assertions.nix
../../modules/generic/meta-maintainers.nix
../../nixos/modules/misc/assertions.nix
(lib.modules.importApply ./config-data.nix { inherit pkgs; })
];
options = {
nixos/modules/system/service/portable/test.nix → lib/services/test.nix
+2 -2
View File
@@ -1,7 +1,7 @@
# Run:
# nix-instantiate --eval nixos/modules/system/service/portable/test.nix
# nix-instantiate --eval lib/services/test.nix
let
lib = import ../../../../../lib;
lib = import ../.;
inherit (lib) mkOption types;
maintainers/maintainer-list.nix
+1 -1
View File
@@ -9653,7 +9653,7 @@
name = "Galois";
};
ggg = {
email = "gggkiller2@gmail.com";
email = "github@ggg.dev";
github = "GGG-KILLER";
githubId = 5892127;
name = "GGG";
maintainers/scripts/luarocks-packages.csv
+6 -1
View File
@@ -52,6 +52,8 @@ lrexlib-pcre,,,,,,
lrexlib-posix,,,,,,
lsp-progress.nvim,,,,,5.1,gepbird
lsqlite3,,,,,,
ltreesitter-ts,,,,,,
ltreesitter,,,,,,
lua-cjson,,,,,,
lua-cmsgpack,,,,,,
lua-curl,,,,,,
@@ -95,6 +97,7 @@ luaprompt,,,,,,Freed-Wu
luarepl,,,,,,
luarocks,,,,,,mrcjkb teto
luarocks-build-rust-mlua,,,,,,mrcjkb
luarocks-build-tree-sitter-cli,,,,,,
luarocks-build-treesitter-parser,,,,,,mrcjkb
luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
luasec,,,,,,flosse
@@ -156,16 +159,18 @@ sqlite,,,,,,
std._debug,,,,,,
std.normalize,,,,,,
stdlib,,,,41.2.2,,
teal-language-server,,,,0.0.5-1,,
teal-language-server,,,,,,
telescope-manix,,,,,,
telescope.nvim,,,,,5.1,
tiktoken_core,,,,,,natsukium
tl,,,,,,mephistophiles
toml-edit,,,,,5.1,mrcjkb
tree-sitter-cli,,,,,,
tree-sitter-http,,,,0.0.33-1,,
tree-sitter-norg,,,,,5.1,mrcjkb
tree-sitter-orgmode,,,,,5.1,
utf8,,,,,,
tree-sitter-teal,,,,,,
vstruct,,,,,,
vusted,,,,,,
xml2lua,,,,,,teto
1 name rockspec ref server version luaversion maintainers
52 lrexlib-posix
53 lsp-progress.nvim 5.1 gepbird
54 lsqlite3
55 ltreesitter-ts
56 ltreesitter
57 lua-cjson
58 lua-cmsgpack
59 lua-curl
97 luarepl
98 luarocks mrcjkb teto
99 luarocks-build-rust-mlua mrcjkb
100 luarocks-build-tree-sitter-cli
101 luarocks-build-treesitter-parser mrcjkb
102 luarocks-build-treesitter-parser-cpp mrcjkb
103 luasec flosse
159 std._debug
160 std.normalize
161 stdlib 41.2.2
162 teal-language-server 0.0.5-1
163 telescope-manix
164 telescope.nvim 5.1
165 tiktoken_core natsukium
166 tl mephistophiles
167 toml-edit 5.1 mrcjkb
168 tree-sitter-cli
169 tree-sitter-http 0.0.33-1
170 tree-sitter-norg 5.1 mrcjkb
171 tree-sitter-orgmode 5.1
172 utf8
173 tree-sitter-teal
174 vstruct
175 vusted
176 xml2lua teto
maintainers/team-list.nix
-1
View File
@@ -225,7 +225,6 @@ with lib.maintainers;
members = [
mdarocha
corngood
ggg
raphaelr
jamiemagee
anpin
nixos/doc/manual/default.nix
+1 -1
View File
@@ -134,7 +134,7 @@ let
inherit
(evalModules {
modules = [
(modules.importApply ../../modules/system/service/portable/service.nix {
(modules.importApply ../../../lib/services/service.nix {
pkgs = throw "nixos docs / portableServiceOptions: Do not reference pkgs in docs";
})
];
nixos/doc/manual/release-notes/rl-2605.section.md
+5
View File
@@ -164,8 +164,13 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
- `services.stalwart-mail` has been renamed to `services.stalwart` to align with upstream re-brand as an e-mail and collaboration server. Other notable breaking changes to module:
- Addition of module-specific `stateVersion` option, which on existing installations of Stalwart must be set to the same as `system.stateVersion`.
This enables manually and carefully migrating Stalwart to a new `stateVersion` or newly enabling the Stalwart module with a newer `stateVersion` than `system.stateVersion`.
- `systemd.services.stalwart` owned by `stalwart:stalwart`. The `user` and `group` are configurable via `services.stalwart.user` and `services.stalwart.group`, respectively. By default, if `stateVersion` is older than `26.05`, will fallback to legacy value of `stalwart-mail` for both `user` and `group`.
- Default value for `services.stalwart.dataDir` has changed to `/var/lib/stalwart`. If `stateVersion` is older than `26.05`, will fallback to legacy value of `/var/lib/stalwart-mail`.
- Default tracer name and type have changed to `journal`. If `stateVersion` is older than `26.05`, will fallback to legacy value of `stdout`.
- `services.eintopf` has been renamed to `services.lauti` to align with upstream re-brand as a community online calendar.
nixos/modules/misc/assertions.nix
+1 -1
View File
@@ -34,5 +34,5 @@
};
# impl of assertions is in
# - <nixpkgs/nixos/modules/system/activation/top-level.nix>
# - <nixpkgs/nixos/modules/system/service/portable/lib.nix>
# - <nixpkgs/lib/services/lib.nix>
}
nixos/modules/misc/documentation.nix
+4 -1
View File
@@ -116,7 +116,10 @@ let
&& (t == "directory" -> baseNameOf n != "tests")
&& (t == "file" -> hasSuffix ".nix" n)
);
prefixRegex = "^" + lib.strings.escapeRegex (toString pkgs.path) + "($|/(modules|nixos)($|/.*))";
prefixRegex =
"^"
+ lib.strings.escapeRegex (toString pkgs.path)
+ "($|/(modules|nixos|lib/services)($|/.*)|/lib)";
filteredModules = builtins.path {
name = "source";
inherit (pkgs) path;
nixos/modules/services/desktop-managers/plasma6.nix
+1
View File
@@ -170,6 +170,7 @@ in
kconfig # required for xdg-terminal from xdg-utils
qtbase # for qtpaths which is required for xdg-mime from xdg-utils
]
++ lib.optional config.networking.networkmanager.enable qrca
++ lib.optionals config.hardware.sensor.iio.enable [
# This is required for autorotation in Plasma 6
qtsensors
nixos/modules/services/mail/stalwart.nix
+43 -18
View File
@@ -8,9 +8,10 @@ let
cfg = config.services.stalwart;
configFormat = pkgs.formats.toml { };
configFile = configFormat.generate "stalwart.toml" cfg.settings;
useLegacyStorage = lib.versionOlder config.system.stateVersion "24.11";
useLegacyDefault = lib.versionOlder config.system.stateVersion "26.05";
default = if useLegacyDefault then "stalwart-mail" else "stalwart";
useLegacyStorage = lib.versionOlder cfg.stateVersion "24.11";
pre2605 = lib.versionOlder cfg.stateVersion "26.05";
stalwartIdentifier = if pre2605 then "stalwart-mail" else "stalwart";
stalwartIdentifierText = ''if lib.versionOlder config.services.stalwart.stateVersion "26.05" then "stalwart-mail" else "stalwart"'';
parsePorts =
listeners:
@@ -31,6 +32,15 @@ in
options.services.stalwart = {
enable = lib.mkEnableOption "the all-in-one collaboration and mail server, Stalwart";
stateVersion = lib.mkOption {
type = lib.types.str;
description = ''
The version of this module (=version of NixOS) when this module was first enabled on this particular machine, used to maintain compatibility with application data created on older versions of this module.
See {option}`system.stateVersion` for details on the NixOS-global equivalent to this option.
'';
};
package = lib.mkPackageOption pkgs "stalwart" { };
openFirewall = lib.mkOption {
@@ -55,7 +65,8 @@ in
dataDir = lib.mkOption {
type = lib.types.path;
default = if useLegacyDefault then "/var/lib/stalwart-mail" else "/var/lib/stalwart";
default = "/var/lib/${stalwartIdentifier}";
defaultText = lib.literalExpression "/var/lib/\${${stalwartIdentifierText}}";
description = ''
Data directory for stalwart
'';
@@ -63,7 +74,8 @@ in
user = lib.mkOption {
type = lib.types.str;
inherit default;
default = stalwartIdentifier;
defaultText = lib.literalExpression stalwartIdentifierText;
description = ''
User ownership of service
'';
@@ -71,7 +83,8 @@ in
group = lib.mkOption {
type = lib.types.str;
inherit default;
default = stalwartIdentifier;
defaultText = lib.literalExpression stalwartIdentifierText;
description = ''
Group ownership of service
'';
@@ -114,12 +127,24 @@ in
# Default config: all local
services.stalwart.settings = {
tracer.stdout = {
type = lib.mkDefault "stdout";
level = lib.mkDefault "info";
ansi = lib.mkDefault false; # no colour markers to journald
enable = lib.mkDefault true;
};
tracer =
if pre2605 then
{
stdout = {
type = lib.mkDefault "stdout";
level = lib.mkDefault "info";
ansi = lib.mkDefault false; # no colour markers to journald
enable = lib.mkDefault true;
};
}
else
{
journal = {
type = lib.mkDefault "journal";
level = lib.mkDefault "info";
enable = lib.mkDefault true;
};
};
store =
if useLegacyStorage then
{
@@ -155,7 +180,7 @@ in
);
in
{
path = "/var/cache/${default}";
path = "/var/cache/${stalwartIdentifier}";
resource = lib.mkIf hasHttpListener (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
};
};
@@ -165,10 +190,10 @@ in
# service is restarted on a potentially large number of files.
# That would cause unnecessary and unwanted delays.
users = {
groups = lib.mkIf (cfg.group == default) {
groups = lib.mkIf (cfg.group == stalwartIdentifier) {
${cfg.group} = { };
};
users = lib.mkIf (cfg.user == default) {
users = lib.mkIf (cfg.user == stalwartIdentifier) {
${cfg.user} = {
isSystemUser = true;
inherit (cfg) group;
@@ -197,7 +222,7 @@ in
KillSignal = "SIGINT";
Restart = "on-failure";
RestartSec = 5;
SyslogIdentifier = default;
SyslogIdentifier = stalwartIdentifier;
ExecStartPre =
if useLegacyStorage then
@@ -217,8 +242,8 @@ in
ReadWritePaths = [
cfg.dataDir
];
CacheDirectory = default;
StateDirectory = default;
CacheDirectory = stalwartIdentifier;
StateDirectory = stalwartIdentifier;
# Upstream uses "stalwart" as the username since 0.12.0
User = cfg.user;
nixos/modules/services/monitoring/collectd.nix
+14
View File
@@ -46,6 +46,20 @@ in
package = lib.mkPackageOption pkgs "collectd" { };
finalPackage = lib.mkOption {
readOnly = true;
default = minimalPackage;
defaultText = lib.literalExpression ''
if config.services.collectd.buildMinimalPackage then
cfg.package.override {
enabledPlugins = [ "syslog" ] ++ builtins.attrNames cfg.plugins;
}
else
cfg.package
'';
description = "The final package being used after applying plugins and minimalPackage.";
};
buildMinimalPackage = lib.mkOption {
default = false;
description = ''
nixos/modules/services/monitoring/prometheus/exporters.nix
+1 -4
View File
@@ -10,11 +10,9 @@
let
inherit (lib)
concatStrings
foldl
foldl'
genAttrs
literalExpression
maintainers
mapAttrs
mapAttrsToList
mkDefault
@@ -22,9 +20,7 @@ let
mkIf
mkMerge
mkOption
optional
types
mkOptionDefault
flip
attrNames
xor
@@ -328,6 +324,7 @@ let
description = "Prometheus ${name} exporter service user";
isSystemUser = true;
inherit (conf) group;
extraGroups = mkIf (name == "libvirt") [ "libvirtd" ];
}
);
users.groups = mkMerge [
nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix
+5
View File
@@ -24,6 +24,11 @@ in
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--libvirt.uri ${cfg.libvirtUri} ${lib.concatStringsSep " " cfg.extraFlags}
'';
RestrictAddressFamilies = [
"AF_UNIX"
"AF_INET"
"AF_INET6"
];
};
};
}
nixos/modules/services/torrent/transmission.nix
+1 -1
View File
@@ -86,7 +86,7 @@ in
`.config/transmission-daemon/settings.json`
(each time the service starts).
See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files)
See [Transmission's documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)
for documentation of settings not explicitly covered by this module.
'';
default = { };
nixos/modules/services/web-apps/drupal.nix
+154 -40
View File
@@ -10,6 +10,7 @@ let
any
attrValues
flatten
getExe
literalExpression
mapAttrs
mapAttrs'
@@ -24,6 +25,9 @@ let
optionalAttrs
types
;
inherit (lib.strings)
removePrefix
;
inherit (pkgs)
mariadb
stdenv
@@ -41,23 +45,42 @@ let
name = "drupal-${hostName}";
src = cfg.package;
buildInputs = [ pkgs.rsync ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r * $out/
rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites
runHook postInstall
'';
postInstall = ''
ln -s ${cfg.filesDir} $out/share/php/${cfg.package.pname}/sites/default/files
ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/${cfg.package.pname}/sites/default/settings.php
ln -s ${cfg.stateDir}/sites $out/share/php/${cfg.package.pname}${cfg.webRoot}
ln -s ${cfg.modulesDir} $out/share/php/${cfg.package.pname}/modules
ln -s ${cfg.themesDir} $out/share/php/${cfg.package.pname}/themes
'';
});
sites =
hostName: cfg:
stdenv.mkDerivation (finalAttrs: {
pname = "drupal-sites-${hostName}";
name = "drupal-sites-${hostName}";
src = cfg.package;
buildInputs = with pkgs; [ rsync ];
installPhase = ''
runHook preInstall
mkdir -p $out/sites
rsync -a ./share/php/${cfg.package.pname}${cfg.webRoot}/sites/* $out/sites/
runHook postInstall
'';
});
drupalSettings =
hostName: cfg:
pkgs.writeTextFile {
@@ -87,6 +110,75 @@ let
'';
};
# Required .htaccess for private files directory
# See: https://www.drupal.org/docs/getting-started/installing-drupal/securing-drupal-file-directories
privateFilesHtAccess = pkgs.writeTextFile {
name = "private-files-htaccess";
text = ''
# Turn off all options we don't need.
Options -Indexes -ExecCGI -Includes -MultiViews
# Set the catch-all handler to prevent scripts from being executed.
SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
<Files *>
# Override the handler again if we're run later in the evaluation list.
SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
</Files>
# If we know how to do it safely, disable the PHP engine entirely.
<IfModule mod_php.c>
php_flag engine off
</IfModule>
'';
};
stateDirManage =
hostName: cfg:
pkgs.writeShellApplication {
name = "drupal-state-init-${hostName}";
excludeShellChecks = [ "SC2194" ];
runtimeInputs = with pkgs; [ rsync ];
text = ''
echo "Updating the sites directory for ${hostName}..."
rsync -auq "${sites hostName cfg}/sites/" "${cfg.stateDir}/sites/" \
--exclude "*/files" \
--delete-before
if [ ! -d "${cfg.filesDir}" ]; then
echo "Preparing files directory..."
mkdir -p "${cfg.filesDir}"
chown -R ${user}:${webserver.group} ${cfg.filesDir}
fi
case ${cfg.filesDir} in
${cfg.stateDir}/sites*) echo "Files directory is in sites directory. Skipping optional link!";;
*) ln -sf "${cfg.filesDir}" "${cfg.stateDir}/sites/default/files";;
esac
if [ ! -f "${cfg.privateFilesDir}/.htaccess" ]; then
echo "Linking .htaccess file for private files directory..."
ln -s "${privateFilesHtAccess}" "${cfg.privateFilesDir}/.htaccess"
fi
echo "Preparing settings.php for ${hostName}..."
settings_file="${cfg.stateDir}/sites/default/settings.php"
if [ ! -f "$settings_file" ]; then
default_settings_file="${cfg.stateDir}/sites/default/default.settings.php";
cp "$default_settings_file" "$settings_file"
fi
cat < ${appendSettings hostName} >> "$settings_file"
chmod 644 "$settings_file"
# Link the NixOS-managed settings file to the state directory.
ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php
# Set or reset file permissions so that the web user and webserver owns them.
chown -R ${user}:${webserver.group} ${cfg.stateDir}
'';
};
siteOpts =
{
options,
@@ -106,6 +198,9 @@ let
defaultText = "/var/lib/drupal/<name>/sites/default/files";
description = ''
The location of the Drupal files directory.
Many of the files in this directory are variable, so they must be located
in a location writeable by users of the webgroup.
'';
};
@@ -120,7 +215,22 @@ let
type = types.path;
default = "/var/lib/drupal/${name}/config/sync";
defaultText = "/var/lib/drupal/<name>/config/sync";
description = "The location of the Drupal config sync directory.";
description = ''
The location of the user-managed Drupal config sync directory.
Drupal will both read from and write to this directory when executing
configuration management operations.
'';
};
webRoot = mkOption {
type = types.str;
default = "";
description = ''
An optional path string with a leading slash
indicating the location of the Drupal webroot relative to the
project root directory, if one exists.
'';
example = "/web";
};
extraConfig = mkOption {
@@ -140,21 +250,41 @@ let
type = types.path;
default = "/var/lib/drupal/${name}";
defaultText = "/var/lib/drupal/<name>";
description = "The location of the Drupal site state directory.";
description = ''
The location of the user-managed Drupal site state directory.
This directory will contain the settings and configuration files for
your Drupal instance. It may also contain your files directory if the
`filesDir` option remains unchanged.
Many of the files in this directory are variable, so they must be located
in a location writeable by users of the webgroup.
'';
};
modulesDir = mkOption {
type = types.path;
default = "/var/lib/drupal/${name}/modules";
defaultText = "/var/lib/drupal/<name>/modules";
description = "The location for users to install Drupal modules.";
description = ''
The location for users to manually install Drupal modules.
Note: in most instances, it is preferable to install modules using
composer, or to package them with your source code repository, if
you are using a custom Drupal.
'';
};
themesDir = mkOption {
type = types.path;
default = "/var/lib/drupal/${name}/themes";
defaultText = "/var/lib/drupal/<name>/themes";
description = "The location for users to install Drupal themes.";
description = ''
The location for users to manually install Drupal themes.
Note: in most instances, it is preferable to install themes using
composer, or to package them with your source code repository, if
you are using a custom Drupal.
'';
};
phpOptions = mkOption {
@@ -357,6 +487,8 @@ in
"d '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
"Z '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.privateFilesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -"
"Z '${cfg.filesDir}' 0750 ${user} ${webserver.group} - -"
"d '${cfg.configSyncDir}' 0750 ${user} ${webserver.group} - -"
]) eachSite
);
@@ -382,42 +514,15 @@ in
User = "root";
RemainAfterExit = true;
ExecStart = writeShellScript "drupal-state-init-${hostName}" ''
set -e
if [ ! -d "${cfg.stateDir}/sites" ]; then
echo "Preparing sites directory..."
cp -r "${cfg.package}/share/php/${cfg.package.pname}/sites" "${cfg.stateDir}"
fi
if [ ! -d "${cfg.filesDir}" ]; then
echo "Preparing files directory..."
mkdir -p "${cfg.filesDir}"
chown -R ${user}:${webserver.group} ${cfg.filesDir}
fi
settings_file="${cfg.stateDir}/sites/default/settings.php"
default_settings="${cfg.package}/share/php/${cfg.package.pname}/sites/default/default.settings.php"
if [ ! -f "$settings_file" ]; then
echo "Preparing settings.php for ${hostName}..."
cp "$default_settings" "$settings_file"
cat < ${appendSettings hostName} >> "$settings_file"
chmod 644 "$settings_file"
fi
# Link the NixOS-managed settings file to the state directory.
ln -sf ${drupalSettings hostName cfg} ${cfg.stateDir}/sites/default/settings.nixos-${hostName}.php
# Set or reset file permissions so that the web user and webserver owns them.
chown -R ${user}:${webserver.group} ${cfg.stateDir}
'';
ExecStart = getExe (stateDirManage hostName cfg);
};
# Rerun this service if certain settings were updated
reloadTriggers = [
cfg.extraConfig
cfg.privateFilesDir
cfg.filesDir
cfg.stateDir
cfg.configSyncDir
];
})
@@ -434,9 +539,9 @@ in
enable = true;
virtualHosts = mapAttrs (hostName: cfg: {
serverName = mkDefault hostName;
root = "${pkg hostName cfg}/share/php/${cfg.package.pname}";
root = "${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot}";
extraConfig = ''
index index.php;
index index.php index.htm index.html;
'';
locations = {
"~ '\\.php$|^/update\\.php'" = {
@@ -515,11 +620,19 @@ in
};
"~ ^/sites/.*/files/styles/" = {
extraConfig = ''
alias ${cfg.filesDir}/;
try_files $uri @rewrite;
'';
};
"^~ /sites/.*/files/" = {
extraConfig = ''
alias ${cfg.filesDir}/;
try_files $uri @rewrite;
'';
};
"~ ^(/[a-z\\-]+)?/system/files/" = {
extraConfig = ''
alias ${cfg.privateFilesDir}/;
try_files $uri /index.php?$query_string;
'';
};
@@ -535,8 +648,9 @@ in
hostName: cfg:
(nameValuePair hostName {
extraConfig = ''
root * ${pkg hostName cfg}/share/php/${cfg.package.pname}
root * ${pkg hostName cfg}/share/php/${cfg.package.pname}${cfg.webRoot}
file_server
root /sites/*/files ${cfg.filesDir}
encode zstd gzip
php_fastcgi unix/${config.services.phpfpm.pools."drupal-${hostName}".socket}
nixos/modules/system/boot/loader/limine/limine-install.py
+3 -3
View File
@@ -492,12 +492,12 @@ def install_bootloader() -> None:
config_file += option_from_config('term_margin_gradient', ['style', 'graphicalTerminal', 'marginGradient'])
config_file += textwrap.dedent('''
# NixOS boot entries start here
# @distroName@ boot entries start here
''')
for (profile, gens) in profiles:
group_name = 'default profile' if profile == 'system' else f"profile '{profile}'"
config_file += f'/+NixOS {group_name}\n'
config_file += f'/+@distroName@ {group_name}\n'
isFirst = True
@@ -506,7 +506,7 @@ def install_bootloader() -> None:
isFirst = False
config_file_path = os.path.join(limine_install_dir, 'limine.conf')
config_file += '\n# NixOS boot entries end here\n\n'
config_file += '\n# @distroName@ boot entries end here\n\n'
config_file += str(config('extraEntries'))
nixos/modules/system/boot/loader/limine/limine.nix
+1
View File
@@ -432,6 +432,7 @@ in
replacements = {
python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);
configPath = limineInstallConfig;
inherit (config.system.nixos) distroName;
};
};
};
nixos/modules/system/service/README.md
+3 -3
View File
@@ -43,7 +43,7 @@ Many services implement automatic reloading or reloading on e.g. `SIGUSR1`, but
### Service Manager Integration
- **Portable base**: The `configData` interface is declared in `portable/config-data.nix`, making it available to all service manager implementations.
- **Portable base**: The `configData` interface is declared in `lib/services/config-data.nix`, making it available to all service manager implementations.
- **Systemd integration**: The systemd implementation (`systemd/system.nix`) maps `configData` entries to `environment.etc` entries under `/etc/system-services/`.
@@ -66,11 +66,11 @@ The modular service infrastructure avoids exposing `pkgs` as a module argument t
### Implementation
- **Portable layer**: Service modules in `portable/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller.
- **Portable layer**: Service modules in `lib/services/` do not receive `pkgs` as a module argument. Any required derivations must be provided by the caller.
- **Systemd integration**: The `systemd/system.nix` module imports `config-data.nix` as a function, providing `pkgs` in lexical closure:
```nix
(import ../portable/config-data.nix { inherit pkgs; })
(import lib/services/config-data.nix { inherit pkgs; })
```
- **Service modules**:
nixos/modules/system/service/systemd/system.nix
+1 -1
View File
@@ -15,7 +15,7 @@ let
mapAttrsToList
;
portable-lib = import ../portable/lib.nix { inherit lib; };
portable-lib = import ../../../../../lib/services/lib.nix { inherit lib; };
dash =
before: after:
nixos/tests/limine/default.nix
+1
View File
@@ -8,4 +8,5 @@
secureBoot = runTest ./secure-boot.nix;
specialisations = runTest ./specialisations.nix;
uefi = runTest ./uefi.nix;
distroName = runTest ./distroName.nix;
}
nixos/tests/limine/distroName.nix
+30
View File
@@ -0,0 +1,30 @@
{ pkgs, ... }:
{
name = "distroName";
meta = {
inherit (pkgs.limine.meta) maintainers;
};
nodes.machine =
{ ... }:
{
virtualisation.useBootLoader = true;
virtualisation.useEFIBoot = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.limine.enable = true;
boot.loader.limine.efiSupport = true;
boot.loader.timeout = 0;
system.nixos.distroName = "BestDistroEver";
};
testScript = /* python */ ''
machine.start()
with subtest('Machine boots correctly'):
machine.wait_for_unit('multi-user.target')
machine.succeed("grep \"BestDistroEver\" /boot/limine/limine.conf")
machine.fail("grep \"NixOS\" /boot/limine/limine.conf")
'';
}
nixos/tests/morph-browser.nix
+4 -3
View File
@@ -6,8 +6,9 @@ let
}:
makeTest (
{ pkgs, lib, ... }:
assert lib.assertMsg withQt6 "`lomiri.morph-browser` has been dropped, cannot test it.";
{
name = "morph-browser-${if withQt6 then "qt6" else "qt5"}-standalone";
name = "morph-browser-qt6-standalone";
meta.maintainers = lib.teams.lomiri.members;
nodes.machine =
@@ -24,7 +25,7 @@ let
services.xserver.enable = true;
environment = {
systemPackages = with (if withQt6 then pkgs.lomiri-qt6 else pkgs.lomiri); [
systemPackages = with pkgs.lomiri-qt6; [
suru-icon-theme
morph-browser
];
@@ -76,6 +77,6 @@ let
);
in
{
qt5 = generic { withQt6 = false; };
qt5 = throw "`lomiri.morph-browser` has been removed because it relied on the known-vulnerable `libsForQt5.qtwebengine`. For testing the Qt6 version of Morph, please use `nixosTests.morph-browser.qt6` instead."; # Added on 2026-03-31
qt6 = generic { withQt6 = true; };
}
nixos/tests/stalwart/stalwart-config.nix
+4 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ lib, ... }:
let
certs = import ../common/acme/server/snakeoil-certs.nix;
@@ -9,6 +9,9 @@ in
services.stalwart = {
enable = true;
stateVersion = lib.trivial.release; # Only for the test; please don't do in production
settings = {
server.hostname = domain;
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
melpaBuild (finalAttrs: {
pname = "ebuild-mode";
version = "1.81";
version = "1.82";
src = fetchzip {
url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2";
hash = "sha256-b+59Ec+NOHvFgbFOmnsvGjnq392VR1JCsPx/ORSdffo=";
hash = "sha256-Rb1L++Ln7jGmdIpXTIBg7x64hHAm0b/yJqILKllCNQs=";
};
meta = {
pkgs/applications/editors/vim/plugins/generated.nix
+52
View File
@@ -4848,6 +4848,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
duck-nvim = buildVimPlugin {
pname = "duck.nvim";
version = "1.0.0-unstable-2024-03-07";
src = fetchFromGitHub {
owner = "tamton-aquib";
repo = "duck.nvim";
rev = "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd";
hash = "sha256-97QSkZHpHLq1XyLNhPz88i9VuWy6ux7ZFNJx/g44K2A=";
};
meta.homepage = "https://github.com/tamton-aquib/duck.nvim/";
meta.hydraPlatforms = [ ];
};
earthly-vim = buildVimPlugin {
pname = "earthly.vim";
version = "0-unstable-2024-04-02";
@@ -5487,6 +5500,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
fluoromachine-nvim = buildVimPlugin {
pname = "fluoromachine.nvim";
version = "0-unstable-2025-10-21";
src = fetchFromGitHub {
owner = "maxmx03";
repo = "fluoromachine.nvim";
rev = "a279f667168e742df059caf1f1f4daf1de24f4f8";
hash = "sha256-alZBQYmo9jrsKYTL7dnObaP2op4SMQQRiEZBdhxUZiI=";
};
meta.homepage = "https://github.com/maxmx03/fluoromachine.nvim/";
meta.hydraPlatforms = [ ];
};
flutter-tools-nvim = buildVimPlugin {
pname = "flutter-tools.nvim";
version = "2.2.0-unstable-2026-01-14";
@@ -10980,6 +11006,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
nvim-ansible = buildVimPlugin {
pname = "nvim-ansible";
version = "0-unstable-2026-02-09";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-ansible";
rev = "c7f595d568b588942d4d0c37b5cd6cae3764a148";
hash = "sha256-Ykp610LPF0tWidHM16UqeaU8sJxcr5OXJdHkjWCYUTU=";
};
meta.homepage = "https://github.com/mfussenegger/nvim-ansible/";
meta.hydraPlatforms = [ ];
};
nvim-autopairs = buildVimPlugin {
pname = "nvim-autopairs";
version = "0.10.0-unstable-2026-01-30";
@@ -11251,6 +11290,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
nvim-dap-ruby = buildVimPlugin {
pname = "nvim-dap-ruby";
version = "0-unstable-2025-07-08";
src = fetchFromGitHub {
owner = "suketa";
repo = "nvim-dap-ruby";
rev = "ba36f9905ca9c6d89e5af5467a52fceeb2bbbf6d";
hash = "sha256-57BBhdrikDEswZe2QW+jHMSgfXIjauc6iDNpWS0YUaU=";
};
meta.homepage = "https://github.com/suketa/nvim-dap-ruby/";
meta.hydraPlatforms = [ ];
};
nvim-dap-ui = buildVimPlugin {
pname = "nvim-dap-ui";
version = "4.0.0-unstable-2026-04-03";
pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+3 -3
View File
@@ -8,18 +8,18 @@
gitMinimal,
}:
let
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
tag = "v${version}";
hash = "sha256-y8f+bmPkb3M6DzcUkJMxd2woDLoBYslne7aB8A0ejCk=";
hash = "sha256-C1FpyGw0f35NdHvDUGPXxmKdOgw3SpIteK1gAjVy6Ns=";
};
blink-fuzzy-lib = rustPlatform.buildRustPackage {
inherit version src;
pname = "blink-fuzzy-lib";
cargoHash = "sha256-3o2n4xwNF9Fc3VlPKf3lnvmN7FVus5jQB8gcXXwz50c=";
cargoHash = "sha256-z8koRYVM9mkgKB6rdZAKIfjZfinVUUpYAW0IvPgmjZ4=";
nativeBuildInputs = [ gitMinimal ];
pkgs/applications/editors/vim/plugins/vim-plugin-names
+4
View File
@@ -371,6 +371,7 @@ https://github.com/dracula/vim/,,dracula-vim
https://github.com/Mofiqul/dracula.nvim/,HEAD,
https://github.com/stevearc/dressing.nvim/,,
https://github.com/Bekaboo/dropbar.nvim/,HEAD,
https://github.com/tamton-aquib/duck.nvim/,HEAD,
https://github.com/earthly/earthly.vim/,HEAD,
https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD,
https://github.com/JellyApple102/easyread.nvim/,HEAD,
@@ -420,6 +421,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
https://github.com/floobits/floobits-neovim/,,
https://github.com/0xstepit/flow.nvim/,HEAD,
https://github.com/projectfluent/fluent.vim/,HEAD,
https://github.com/maxmx03/fluoromachine.nvim/,HEAD,
https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD,
https://github.com/nvim-focus/focus.nvim/,HEAD,
https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
@@ -841,6 +843,7 @@ https://github.com/nacro90/numb.nvim/,,
https://github.com/nvchad/nvchad/,HEAD,
https://github.com/nvchad/ui/,HEAD,nvchad-ui
https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
https://github.com/mfussenegger/nvim-ansible/,HEAD,
https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
https://github.com/windwp/nvim-autopairs/,,
@@ -864,6 +867,7 @@ https://github.com/julianolf/nvim-dap-lldb/,HEAD,
https://codeberg.org/mfussenegger/nvim-dap-python/,HEAD,
https://github.com/rinx/nvim-dap-rego/,HEAD,
https://github.com/jonboh/nvim-dap-rr/,HEAD,
https://github.com/suketa/nvim-dap-ruby/,HEAD,
https://github.com/rcarriga/nvim-dap-ui/,,
https://github.com/igorlfs/nvim-dap-view/,HEAD,
https://github.com/theHamsta/nvim-dap-virtual-text/,,
pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "29.0.3";
hash = "sha256-+MNm0IYbvq2OdqOyhXwfMAhzp/V4jR0Qpf461KIP6Ho=";
version = "30.0.4";
hash = "sha256-5y7LTkiR7dnSHbL80pqsTb57rnLyEbIrHT4xzseVj84=";
};
meta = {
pkgs/applications/editors/vscode/extensions/default.nix
+12 -12
View File
@@ -1270,8 +1270,8 @@ let
mktplcRef = {
publisher = "denoland";
name = "vscode-deno";
version = "3.51.0";
hash = "sha256-iEwguP0qL8WHIMuJDPPPUp5ka9S4g7XHOl0i2++jgi8=";
version = "3.52.0";
hash = "sha256-0Qkruo7Eh86JRm58G7XhyceUpCJDmhoYaPjUKJQjFiU=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";
@@ -1729,8 +1729,8 @@ let
mktplcRef = {
name = "foam-vscode";
publisher = "foam";
version = "0.33.0";
hash = "sha256-xeZp75qnxnW2LNtRz0IUzrBjBe5Po3VHGTta+6VCLvQ=";
version = "0.35.0";
hash = "sha256-5tjSXwjiNMC8NlGAa0NQ5uWw+wTEPePL1GgRhnBAtUo=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -3552,8 +3552,8 @@ let
mktplcRef = {
name = "vscode-just-syntax";
publisher = "nefrob";
version = "0.10.0";
hash = "sha256-dBNftT+yhyfXutDtRvihwl1WrgFENR61eFh9ONqjjq0=";
version = "0.10.1";
hash = "sha256-s/JxIALrYb/dew1CdvvM1UmnewyRcJPB/ETJ/Ai2QJA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog";
@@ -3766,8 +3766,8 @@ let
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "31.6.0";
hash = "sha256-jbcAB3IeUrdWTVV+8ssMumHd5aeXJH6tivWGezJ7amU=";
version = "31.8.0";
hash = "sha256-xSkT6VlRrC36jnuB16V+eDozDutrv2ksqxatU/KIgS0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -4497,8 +4497,8 @@ let
mktplcRef = {
name = "svelte-vscode";
publisher = "svelte";
version = "109.14.2";
hash = "sha256-yY1iVbTz4Yq6ZgNVaSpukxnKLlg2XccEPWzuGoGMkmM=";
version = "109.15.0";
hash = "sha256-/1we+6X3l7MCx96ELz7wg6oDDAcYCJBt7XJ4X0ihwx0=";
};
meta = {
changelog = "https://github.com/sveltejs/language-tools/releases";
@@ -5221,8 +5221,8 @@ let
mktplcRef = {
name = "gitblame";
publisher = "waderyan";
version = "13.0.0";
sha256 = "sha256-I6b4GDM8Ogf+ZH2lD2g4fUkQY9ktuO1xqxfSH6vAMVk=";
version = "13.0.1";
sha256 = "sha256-N0UgWdwGj3NW4x0Ea+jKL5Jvp0YE+HfK5tkUjmynPuY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
pkgs/applications/editors/vscode/extensions/jjk.jjk/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jjk";
publisher = "jjk";
version = "0.9.3";
hash = "sha256-wkHMZTLi3dDV6JQdfJ4hI5uwGAlCmKwg+v8Z9RMU1wU=";
version = "0.10.0";
hash = "sha256-mzsujU3fil3z3yDxpecaOpbXX1K8oh+6dfx/rbOwFYs=";
};
meta = {
changelog = "https://github.com/keanemind/jjk/releases";
pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pylance";
publisher = "MS-python";
version = "2026.1.1";
hash = "sha256-82zIUJBgjbBW0R6ExBLXGYYtYxm1vC7bz/3BvP3IIXA=";
version = "2026.2.1";
hash = "sha256-u1n4OqjBCAaRZe8Mu2vzYfZE6tpJQSQ3gSInJsNSSnQ=";
};
buildInputs = [ pyright ];
pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
version = "1.0.5959";
hash = "sha256-MibP2zqTwlXXVsXQOSuoi5SO8BskJC/AihrhJFg8tac=";
version = "1.1.119";
hash = "sha256-s7GCJvlMCcZ+OOwdSh82moU7BlQLz1hVPMwZ9MYtahM=";
};
postPatch = ''
pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+2 -2
View File
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "tinymist";
publisher = "myriad-dreamin";
version = "0.14.14";
hash = "sha256-CfYlhglaSe36tdCCX6u3U1b/KqbQR6foO8GNn6BbzFg=";
version = "0.14.16";
hash = "sha256-R4tlQgtQaXIT6qiBg1RqQB0Usnsj0Ijs2Bhn2J1CQq4=";
};
nativeBuildInputs = [
pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-dev";
publisher = "saoudrizwan";
version = "3.75.0";
hash = "sha256-ckOvU9aWSASUmOqJe+4u4+E3C7Nf2a6tFkO+P4MLt9k=";
version = "3.77.0";
hash = "sha256-xJDHPmqPRAc9hOD8tIat4isTqLYpN1mOzgw/f+nt1GI=";
};
meta = {
pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "explorer";
publisher = "vitest";
version = "1.50.0";
hash = "sha256-Fl9HtEavM1Cyxf5IMBN7/12s+JGF3MfLRFeut2pEp+s=";
version = "1.50.1";
hash = "sha256-qMUslEBzYK7nH9k+UBygEt+PjOHwDg/hLvfmbYR++tc=";
};
meta = {
changelog = "https://github.com/vitest-dev/vscode/releases";
pkgs/applications/emulators/libretro/cores/beetle-supergrafx.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-supergrafx";
version = "0-unstable-2024-11-15";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-supergrafx-libretro";
rev = "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0";
hash = "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk=";
rev = "3442f442b112ccf869791600661438804f1dfc51";
hash = "sha256-5MJ9IxIL2PX0vxZTSCcAHjxacK5BQZ+Dj5tSxiW+2x8=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/gw.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gw";
version = "0-unstable-2024-10-21";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "gw-libretro";
rev = "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd";
hash = "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao=";
rev = "f8750d0f37db5f1f779437710f2653e8b1651ded";
hash = "sha256-nhCklogKXqjIsRFFKPk6SoIA+K7oCl+15dWdtvvcznE=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/handy.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "handy";
version = "0-unstable-2025-06-16";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-handy";
rev = "fca239207e9c111da3e85d2faf0b1b9d7524e498";
hash = "sha256-8RpRhGgW5JWY6TZa9CEaXF66WpbjcjprorVqu+FGYu0=";
rev = "ae216ac46e15b0f7af20d0d42042d7db1a28ec96";
hash = "sha256-KKYdAEzFnUCbzanB8P+ME2pEdz90eAzAE79pTOFSHZo=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/mame2003.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003";
version = "0-unstable-2025-12-13";
version = "0-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-libretro";
rev = "6c32fa9fc005d7e924909c6ff4684da9abb00ceb";
hash = "sha256-NPPwLruxafBUwKYy+DuLrTZa5QlbneWQSvCRN6ispdM=";
rev = "c651c573655218428d7c524f611f7d62d13861a1";
hash = "sha256-7tAmLBClwM6gMILiWN3cIl452EX0JVFtTSEdxPoRs/4=";
};
# Fix build with GCC 14
pkgs/applications/emulators/libretro/cores/ppsspp.nix
+3 -3
View File
@@ -13,13 +13,13 @@
}:
mkLibretroCore {
core = "ppsspp";
version = "0-unstable-2026-03-27";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "3e69145712550dfa44f3f1a92a5efe64774db1f9";
hash = "sha256-iRtL6VdQcDOAJ2b/YBjlLX+A24BwnBkNiNo7aYAzVdU=";
rev = "030c7a9e6b1a22bf8ee1db40f4d4b7402095bce1";
hash = "sha256-qy9S6/ThIA4YtO6J5R4RdPq4BvHDmwq7Y063gXXTuiQ=";
fetchSubmodules = true;
};
pkgs/applications/emulators/libretro/cores/twenty-fortyeight.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "2048";
version = "0-unstable-2025-12-13";
version = "0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-2048";
rev = "e70c3f82d2b861c64943aaff7fcc29a63013997d";
hash = "sha256-ZNJUaXIQi9VnmmCikhCtXfhbTZ7rfJ1wm/582gaZCmk=";
rev = "1892de39d80ec37e1fac79729cd91917b21f1349";
hash = "sha256-lNcDdkiWiXhvwwpzMnceTDY+mJl1JTZfGCY+WIOvrP8=";
};
meta = {
pkgs/applications/emulators/libretro/cores/vice.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "vice-${type}";
version = "0-unstable-2026-03-09";
version = "0-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "libretro";
repo = "vice-libretro";
rev = "8818c3a39146b9a26df23a1e4880b4420f93a255";
hash = "sha256-Nw+F2hn97F1rKB2UOh/MMNrqmNj87XzRPgEptYoTe7o=";
rev = "8cf6a20017b1f331d5d3ac63b49a5fa75440073a";
hash = "sha256-KnqSx/wv5YTV4MnjEsgIIMnus3m5Rat4go8GzPNUZHs=";
};
makefile = "Makefile";
pkgs/applications/networking/cluster/terraform-providers/providers.json
+18 -18
View File
@@ -110,13 +110,13 @@
"vendorHash": null
},
"bpg_proxmox": {
"hash": "sha256-vPxAIFCOvVveDJQQR/2lQFced/CPyM5f/vujhMV+myQ=",
"hash": "sha256-1bNiIhF5AyvpQZYIOu9YHa+ACx/mE+1MRUdK8AcHuv0=",
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
"owner": "bpg",
"repo": "terraform-provider-proxmox",
"rev": "v0.99.0",
"rev": "v0.100.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-bTFGdrWN2P7z9+IQhftJYlne9NCrVMPDyx0eysZ8y44="
"vendorHash": "sha256-l0acl8PpDN/o2OHVRirswy297L/VM8MC85OrsPbyo0s="
},
"brightbox_brightbox": {
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -616,13 +616,13 @@
"vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
},
"hashicorp_local": {
"hash": "sha256-DMYj2hPASzMDtVZNWcUyzMlGfTw1J/bp19tZUl3bjic=",
"hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=",
"homepage": "https://registry.terraform.io/providers/hashicorp/local",
"owner": "hashicorp",
"repo": "terraform-provider-local",
"rev": "v2.7.0",
"rev": "v2.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-UOT5dxWa3PAzEHKXKYFadh9KWJ2ZKfN5uyFB3tyvHAY="
"vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g="
},
"hashicorp_nomad": {
"hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
@@ -824,13 +824,13 @@
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
},
"kreuzwerker_docker": {
"hash": "sha256-ywVrqqwgYCOZO7Cey3gM9w+EdSQY+vJ/djfJF0X5xyc=",
"hash": "sha256-fektxIObUvQSHeu1MJL3lirF+oUq8+CheaxcPDoQB+k=",
"homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
"owner": "kreuzwerker",
"repo": "terraform-provider-docker",
"rev": "v3.9.0",
"rev": "v4.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Cxz0mDLOgUAnfP1kCP3DE28T1LwLsABAipyVXCngpYE="
"vendorHash": "sha256-wqHArSldDyAxFX0Hmcl6FRDzfRuZGssl1h4GjN/0mgQ="
},
"launchdarkly_launchdarkly": {
"hash": "sha256-lcemT7kpBlZX35Sb+ujHzSdakBQkUSmYAxTVsJkRW6A=",
@@ -842,13 +842,13 @@
"vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8="
},
"linode_linode": {
"hash": "sha256-i2zAB/3cDOex7j2WciKlRlYfOyhkixEHYbTkoCG1u9s=",
"hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v3.10.0",
"rev": "v3.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
"vendorHash": "sha256-91mdCcM5BSNdgW1/mMbuNtAxc4TH1abW8xbRcbHAnNc="
},
"loafoe_htpasswd": {
"hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",
@@ -1166,22 +1166,22 @@
"vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag="
},
"sap_btp": {
"hash": "sha256-v6zo4JPcXCzjVLEk3ByPEXDaL450MUqcaMZioapsId0=",
"hash": "sha256-3UuetY6pIfZ2glG9tZOaF/Xe/MC4Mq0iVUdi8fNaEsQ=",
"homepage": "https://registry.terraform.io/providers/SAP/btp",
"owner": "SAP",
"repo": "terraform-provider-btp",
"rev": "v1.20.1",
"rev": "v1.21.3",
"spdx": "Apache-2.0",
"vendorHash": "sha256-QO+qM7tv75KbpJ08LDhaUCLtYogQ8dhKM3wNuR+aAhQ="
"vendorHash": "sha256-1I2HQwFkbCawi11MJQzhvjvzjUvSzietRV9yCc6JtmI="
},
"scaleway_scaleway": {
"hash": "sha256-Flh/bJSCjaDvw6cVJC6LDcCs9LPXDKX/oXLJibZxTMc=",
"hash": "sha256-alsM14F6NbpkO1RVDgHPoIUoakv4PHeObVdwQMwADZA=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.70.1",
"rev": "v2.71.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-FLap0ZFuYD6RXNQaVLScOI5w+Wfba3utyP2/gZ9fGWo="
"vendorHash": "sha256-a6A30IJlS6a6MjWrR/GWx7XCvilvTu9bQurCXWDLjV4="
},
"scottwinkler_shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+265 -265
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/office/libreoffice/default.nix
+122 -36
View File
@@ -4,9 +4,11 @@
fetchurl,
fetchgit,
fetchpatch2,
fetchFromGitLab,
lib,
pam,
python3,
python3Packages,
libxslt,
perl,
perlPackages,
@@ -28,6 +30,8 @@
flex,
zip,
unzip,
fast-float,
md4c,
gtk3,
libmspack,
getopt,
@@ -35,9 +39,12 @@
cairo,
which,
icu,
boost,
boost188,
jdk21,
ant,
cups,
libixion,
libxtst,
libxi,
libxinerama,
@@ -78,6 +85,7 @@
libcdr,
lcms2,
unixodbc,
mdds,
sane-backends,
mythes,
libexttextcat,
@@ -107,6 +115,7 @@
libepubgen,
libetonyek,
libpng,
liborcus,
libxcrypt,
langs ? [
"ar"
@@ -213,6 +222,90 @@ let
];
};
mdds_2_1 = mdds.overrideAttrs {
version = "2.1.1";
src = fetchFromGitLab {
owner = "mdds";
repo = "mdds";
rev = "2.1.1";
hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA=";
};
};
# required for libreoffice-collabora version 25.04.9-4
libixion_0_19 = libixion.overrideAttrs {
version = "0.19.0";
src = fetchFromGitLab {
owner = "ixion";
repo = "ixion";
rev = "0.19.0";
hash = "sha256-BrexWRaxrLTWuoU62kqws3tlSqVOHecSV5MXc4ZezFs=";
};
buildInputs = [
boost188
mdds_2_1
python3
];
patches = [
# fix build with gcc 15, Add a missing <cstdint> include
(fetchpatch2 {
url = "https://gitlab.com/ixion/ixion/-/merge_requests/70.patch";
hash = "sha256-FzU/aejcMktrDQql5pzobiq6BJXryIXQXZTBWCkyqtU=";
})
];
};
# required for libreoffice-collabora version 25.04.9-4
liborcus_0_19 = liborcus.overrideAttrs {
version = "0.19.2";
src = fetchFromGitLab {
owner = "orcus";
repo = "orcus";
rev = "0.19.2";
hash = "sha256-+9C52H99c/kL5DEIoXV+WcLnTftRbicRLQN/FdIXBw8=";
};
buildInputs = [
boost188
libixion_0_19
mdds_2_1
python3
zlib
];
patches = [
# fix build with gcc 15, Add missing <cstdint> includes
(fetchpatch2 {
url = "https://gitlab.com/orcus/orcus/-/merge_requests/200.patch";
hash = "sha256-CZVw1+ri6UO56Bg/Y27W6G8JkGU6xDInd7fABr6i+7g=";
})
];
};
# required for libreoffice-still version 25.8.5.2
liborcus_0_20 = liborcus.overrideAttrs {
version = "0.20.1";
src = fetchFromGitLab {
owner = "orcus";
repo = "orcus";
rev = "0.20.1";
hash = "sha256-+YTK0EPgGHN4yKurJjuWWrAHzgtbc1dOvtppcvuRei4=";
};
buildInputs = [
boost188
libixion
mdds
python3
zlib
];
};
importVariant = f: import (./. + "/src-${variant}/${f}");
# Update these files with:
# nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped
@@ -304,47 +397,25 @@ stdenv.mkDerivation (finalAttrs: {
# Don't detect Qt paths from qmake, so our patched-in onese are used
./dont-detect-qt-paths-from-qmake.patch
]
++ lib.optionals (variant != "collabora") [
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
./readd-explicit-zlib-link.patch
]
++ lib.optionals (lib.versionOlder version "25.8.2.1") [
++ lib.optionals (variant == "collabora") [
# Backport patch to fix build with Poppler 25.09
(fetchpatch2 {
url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
includes = [ "sdext/*" ];
hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
})
# Fix build with Poppler 25.10
(fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
})
]
++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
# Fix build with Poppler 25.10
(fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
})
]
++ lib.optionals (variant == "collabora") [
# Backport patch to fix build with Poppler 25.05
(fetchpatch2 {
url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
includes = [ "sdext/*" ];
hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
})
# Currently included in the condition above
# Uncomment if Collabora is again the only version needing it
# Remove if Collabora is updated far enough not to need it anymore
## Fix build with Poppler 25.10
#(fetchpatch2 {
# url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
# hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
#})
]
++ lib.optionals (variant == "collabora") [
./fix-unpack-collabora.patch
];
@@ -391,6 +462,9 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withJava [
ant
jdk21
]
++ optionals (lib.versionAtLeast version "26.2.1.2") [
python3Packages.afdko
];
buildInputs =
@@ -404,6 +478,7 @@ stdenv.mkDerivation (finalAttrs: {
coinmp
abseil-cpp
bluez5
boost
box2d_2
cairo
clucene-core_2
@@ -469,6 +544,7 @@ stdenv.mkDerivation (finalAttrs: {
libzmf
libwebp
lp_solve
mdds
mythes
ncurses
neon
@@ -495,6 +571,20 @@ stdenv.mkDerivation (finalAttrs: {
]
++ optionals withJava [
jre'
]
++ optionals (variant == "collabora") [
fast-float
liborcus_0_19
mdds_2_1
md4c
]
++ optionals (variant == "still") [
liborcus_0_20
]
++ optionals (variant == "fresh") [
fast-float
liborcus
md4c
];
preConfigure = ''
@@ -537,6 +627,8 @@ stdenv.mkDerivation (finalAttrs: {
"--without-buildconfig-recorded"
(lib.withFeature withHelp "help")
"--with-boost=${getDev boost}"
"--with-boost-libdir=${getLib boost}/lib"
"--with-vendor=NixOS"
"--disable-report-builder"
"--disable-online-update"
@@ -563,8 +655,10 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature withFonts "fonts")
"--without-doxygen"
"--with-system-afdko"
"--with-system-cairo"
"--with-system-coinmp"
"--with-system-fast-float"
"--with-system-headers"
"--with-system-libabw"
"--with-system-libcmis"
@@ -574,6 +668,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-system-libs"
"--with-system-libwps"
"--with-system-lpsolve"
"--with-system-mdds"
"--with-system-openldap"
"--with-system-openssl"
"--with-system-orcus"
@@ -593,12 +688,6 @@ stdenv.mkDerivation (finalAttrs: {
"--without-system-dragonbox"
"--without-system-libfixmath"
# TODO: bump this to 0.20
"--without-system-orcus"
# TODO: bump this to 3.0 (#382851)
"--without-system-mdds"
# requires an oddly specific, old version
"--without-system-hsqldb"
@@ -608,9 +697,6 @@ stdenv.mkDerivation (finalAttrs: {
# is packaged but headers can't be found because there is no pkg-config file
"--without-system-zxcvbn"
# cannot find headers, no idea why
"--without-system-boost"
"--without-system-java-websocket"
]
++ optionals kdeIntegration [
pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch
+112
View File
@@ -47,6 +47,42 @@ index 1396cef69fa5..8ca0e4043f72 100644
createScDoc();
ScDocument* pDoc = getScDoc();
diff --git i/sc/qa/unit/subsequent_filters_test3.cxx w/sc/qa/unit/subsequent_filters_test3.cxx
index fb5343932ac7..b48c3e9c08c7 100644
--- i/sc/qa/unit/subsequent_filters_test3.cxx
+++ w/sc/qa/unit/subsequent_filters_test3.cxx
@@ -888,6 +888,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testAutoheight2Rows)
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testXLSDefColWidth)
{
+ return; // flaky layout test; depends on the system font versions?
// XLS has only 256 columns; but on import, we need to set default width to all above that limit
createScDoc("xls/chartx.xls");
ScDocument* pDoc = getScDoc();
diff --git i/sc/qa/unit/subsequent_filters_test4.cxx w/sc/qa/unit/subsequent_filters_test4.cxx
index b1b170de2a0b..fa4b16445717 100644
--- i/sc/qa/unit/subsequent_filters_test4.cxx
+++ w/sc/qa/unit/subsequent_filters_test4.cxx
@@ -297,6 +297,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testChartImportODS)
#if HAVE_MORE_FONTS
CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testChartImportXLS)
{
+ return; // fails consistently
createScDoc("xls/chartx.xls");
ScDocument* pDoc = getScDoc();
diff --git i/sd/qa/filter/eppt/eppt.cxx w/sd/qa/filter/eppt/eppt.cxx
index 460a6c10db1f..d455d0973449 100644
--- i/sd/qa/filter/eppt/eppt.cxx
+++ w/sd/qa/filter/eppt/eppt.cxx
@@ -113,6 +113,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport)
CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a media shape that has an animation that specifies looping for the video:
loadFromFile(u"video-loop.pptx");
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 40d2c6f174de..9f540581133e 100644
--- a/sc/qa/unit/ucalc_formula.cxx
@@ -200,3 +236,79 @@ index 4909267f7c74..63a177b0a2a5 100644
saveAsPDF(u"tdf164106.fodt");
auto pPdfDocument = parsePDFExport();
diff --git i/sd/qa/unit/export-tests-ooxml2.cxx w/sd/qa/unit/export-tests-ooxml2.cxx
index 9678eabb27ee..05deb6f234b7 100644
--- i/sd/qa/unit/export-tests-ooxml2.cxx
+++ w/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1290,6 +1290,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testRotateFlip)
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf106867)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
createSdImpressDoc("pptx/tdf106867.pptx");
save(TestFilter::PPTX);
@@ -1915,6 +1916,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf59323_slideFooters)
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf53970)
{
+ return; // error: XDG_RUNTIME_DIR is invalid or not set in the environment.
// Embedded media file
{
createSdImpressDoc("odp/tdf53970.odp");
diff --git i/slideshow/qa/engine/engine.cxx w/slideshow/qa/engine/engine.cxx
index 6644ddae0d4c..fb4a70b1e700 100644
--- i/slideshow/qa/engine/engine.cxx
+++ w/slideshow/qa/engine/engine.cxx
@@ -54,6 +54,7 @@ GetFirstCommandNodeOfPage(const uno::Reference<drawing::XDrawPage>& xPage)
CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a document with a looping video, the looping is defined as part of its auto-play
// animation (and not on the media shape):
loadFromFile(u"video-loop.pptx");
--- i/xmloff/qa/unit/draw.cxx
+++ w/xmloff/qa/unit/draw.cxx
@@ -164,6 +164,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeExport)
CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testVideoSnapshot)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Execute ODP import:
loadFromFile(u"video-snapshot.odp");
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent,
diff --git i/svx/qa/unit/svdraw.cxx w/svx/qa/unit/svdraw.cxx
index b3b8ce14e227..eae079a6a717 100644
--- i/svx/qa/unit/svdraw.cxx
+++ w/svx/qa/unit/svdraw.cxx
@@ -571,6 +571,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular)
CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a slide with a media shape, containing a 4 sec video, red-green-blue-black being the 4
// seconds:
loadFromFile(u"video-snapshot.pptx");
diff --git i/sd/qa/unit/SVGExportTests.cxx w/sd/qa/unit/SVGExportTests.cxx
index 5f73bad89f3b..d1ff4ccf7f5f 100644
--- i/sd/qa/unit/SVGExportTests.cxx
+++ w/sd/qa/unit/SVGExportTests.cxx
@@ -149,6 +149,7 @@ public:
void testSVGExportEmbeddedVideo()
{
+ return; // Failed to connect PipeWire event context (errno: 112)
loadFromFile(u"slide-video-thumbnail.odp");
save(TestFilter::SVG_IMPRESS);
--- i/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ w/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -392,6 +392,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868)
/// Tests that embedded video from Impress is not exported as a linked one.
CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105093)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
vcl::filter::PDFDocument aDocument;
load(u"tdf105093.odp", aDocument);
pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch
+229 -38
View File
@@ -116,18 +116,6 @@ index 5f008a55b1c0..c6ae2a9023de 100644
createSwDoc("tdf166152.fodt");
auto* pWrtShell = getSwDocShell()->GetWrtShell();
diff --git i/sw/qa/extras/odfexport/odfexport4.cxx w/sw/qa/extras/odfexport/odfexport4.cxx
index 91d51ef40d48..f4447b5f7f35 100644
--- i/sw/qa/extras/odfexport/odfexport4.cxx
+++ w/sw/qa/extras/odfexport/odfexport4.cxx
@@ -1196,6 +1196,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
// - Error: "2001-01-01" does not satisfy the "dateTime" type
// because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
loadAndReload("midnight_redline.fodt");
+ return; // fails on aarch64
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
assertXPathContent(pXmlDoc,
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 0f0cd9ed3403..b40b3240120c 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -177,6 +165,235 @@ index 0537b6e4f4ffdae3b094457db0034f2de8676608..8ce4deaa368f11fdc7eb36fec4e75501
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
diff --git i/reportdesign/qa/unit/ReportDesignBasicTests.cxx w/reportdesign/qa/unit/ReportDesignBasicTests.cxx
index 875aca028be9..41df1e3e7ab0 100644
--- i/reportdesign/qa/unit/ReportDesignBasicTests.cxx
+++ w/reportdesign/qa/unit/ReportDesignBasicTests.cxx
@@ -37,6 +37,7 @@ public:
CPPUNIT_TEST_FIXTURE(RptBasicTest, roundTripTest)
{
+ return; // com.sun.star.io.WrongFormatException: {Message: "The extension is not installed."
// Test loading and saving an already prepared Report
// This is a very general test designed to catch crashes
// on import and saving
@@ -61,6 +62,7 @@ CPPUNIT_TEST_FIXTURE(RptBasicTest, roundTripTest)
CPPUNIT_TEST_FIXTURE(RptBasicTest, multiGroupingSameFieldIntervals)
{
+ return; // com.sun.star.io.WrongFormatException: {Message: "The extension is not installed."
// ODB fixture must contain a table and a report that groups on the same field twice
// with different settings (e.g., INTERVAL 5 and INTERVAL 10). The report should be
// prepared to reproduce the original failure (Column not found: INT_count_...).
diff --git i/sc/qa/unit/subsequent_filters_test3.cxx w/sc/qa/unit/subsequent_filters_test3.cxx
index fb5343932ac7..b48c3e9c08c7 100644
--- i/sc/qa/unit/subsequent_filters_test3.cxx
+++ w/sc/qa/unit/subsequent_filters_test3.cxx
@@ -888,6 +888,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testAutoheight2Rows)
CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testXLSDefColWidth)
{
+ return; // flaky layout test; depends on the system font versions?
// XLS has only 256 columns; but on import, we need to set default width to all above that limit
createScDoc("xls/chartx.xls");
ScDocument* pDoc = getScDoc();
diff --git i/sd/qa/filter/eppt/eppt.cxx w/sd/qa/filter/eppt/eppt.cxx
index 460a6c10db1f..d455d0973449 100644
--- i/sd/qa/filter/eppt/eppt.cxx
+++ w/sd/qa/filter/eppt/eppt.cxx
@@ -113,6 +113,7 @@ CPPUNIT_TEST_FIXTURE(Test, testThemeExport)
CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a media shape that has an animation that specifies looping for the video:
loadFromFile(u"video-loop.pptx");
diff --git i/sd/qa/unit/export-tests.cxx w/sd/qa/unit/export-tests.cxx
index 15c867227d8f..53071c9a0eff 100644
--- i/sd/qa/unit/export-tests.cxx
+++ w/sd/qa/unit/export-tests.cxx
@@ -1065,6 +1065,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfTextPos)
CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
auto pPdfium = vcl::pdf::PDFiumLibrary::get();
if (!pPdfium)
return;
@@ -1104,6 +1105,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont)
CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfHindi)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
auto pPdfium = vcl::pdf::PDFiumLibrary::get();
if (!pPdfium)
return;
diff --git i/sd/qa/unit/SVGExportTests.cxx w/sd/qa/unit/SVGExportTests.cxx
index 5f73bad89f3b..d1ff4ccf7f5f 100644
--- i/sd/qa/unit/SVGExportTests.cxx
+++ w/sd/qa/unit/SVGExportTests.cxx
@@ -149,6 +149,7 @@ public:
void testSVGExportEmbeddedVideo()
{
+ return; // Failed to connect PipeWire event context (errno: 112)
loadFromFile(u"slide-video-thumbnail.odp");
save(TestFilter::SVG_IMPRESS);
diff --git i/sd/qa/unit/export-tests-ooxml2.cxx w/sd/qa/unit/export-tests-ooxml2.cxx
index 9678eabb27ee..05deb6f234b7 100644
--- i/sd/qa/unit/export-tests-ooxml2.cxx
+++ w/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1290,6 +1290,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testRotateFlip)
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf106867)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
createSdImpressDoc("pptx/tdf106867.pptx");
save(TestFilter::PPTX);
@@ -1915,6 +1916,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf59323_slideFooters)
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf53970)
{
+ return; // error: XDG_RUNTIME_DIR is invalid or not set in the environment.
// Embedded media file
{
createSdImpressDoc("odp/tdf53970.odp");
diff --git i/slideshow/qa/engine/engine.cxx w/slideshow/qa/engine/engine.cxx
index 6644ddae0d4c..fb4a70b1e700 100644
--- i/slideshow/qa/engine/engine.cxx
+++ w/slideshow/qa/engine/engine.cxx
@@ -54,6 +54,7 @@ GetFirstCommandNodeOfPage(const uno::Reference<drawing::XDrawPage>& xPage)
CPPUNIT_TEST_FIXTURE(Test, testLoopingFromAnimation)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a document with a looping video, the looping is defined as part of its auto-play
// animation (and not on the media shape):
loadFromFile(u"video-loop.pptx");
diff --git i/xmloff/qa/unit/draw.cxx w/xmloff/qa/unit/draw.cxx
index 92f810ef8bb7..bda56abe3f24 100644
--- i/xmloff/qa/unit/draw.cxx
+++ w/xmloff/qa/unit/draw.cxx
@@ -164,6 +164,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeExport)
CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testVideoSnapshot)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Execute ODP import:
loadFromFile(u"video-snapshot.odp");
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent,
diff --git i/svx/qa/unit/svdraw.cxx w/svx/qa/unit/svdraw.cxx
index b3b8ce14e227..eae079a6a717 100644
--- i/svx/qa/unit/svdraw.cxx
+++ w/svx/qa/unit/svdraw.cxx
@@ -571,6 +571,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular)
CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
// Given a slide with a media shape, containing a 4 sec video, red-green-blue-black being the 4
// seconds:
loadFromFile(u"video-snapshot.pptx");
diff --git i/sw/qa/extras/layout/layout4.cxx w/sw/qa/extras/layout/layout4.cxx
index b1e3897acd12..d4d29bd6090c 100644
--- i/sw/qa/extras/layout/layout4.cxx
+++ w/sw/qa/extras/layout/layout4.cxx
@@ -380,6 +380,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testTdf145826)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, testTable0HeightRows)
{
+ return; // flaky layout test; depends on the system font versions?
createSwDoc("table-0-height-rows.fodt");
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
diff --git i/sw/qa/extras/layout/layout6.cxx w/sw/qa/extras/layout/layout6.cxx
index 59571bcdf03f..7853bc378951 100644
--- i/sw/qa/extras/layout/layout6.cxx
+++ w/sw/qa/extras/layout/layout6.cxx
@@ -485,6 +485,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter6, testTdf158658c)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter6, testTdf155177)
{
+ return; // flaky
+
createSwDoc("tdf155177-1-min.odt");
uno::Reference<beans::XPropertySet> xStyle(
diff --git i/sw/qa/extras/uiwriter/uiwriter4.cxx w/sw/qa/extras/uiwriter/uiwriter4.cxx
index a4c3b4a62bbc..8a41e4a9b2ed 100644
--- i/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ w/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -94,6 +94,7 @@ void SwUiWriterTest4::mergeDocs(const char* aDestDoc, const char* aInsertDoc)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96515)
{
+ return; // assertion failed?
// Enable hide whitespace mode.
createSwDoc();
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
@@ -552,6 +553,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96943)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96536)
{
+ return; // fails on aarch64
// Enable hide whitespace mode.
createSwDoc();
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
@@ -963,6 +965,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNewAfterReload
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf96961)
{
+ return; // fails on aarch64
// Insert a page break.
createSwDoc();
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
@@ -2105,6 +2108,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf106736)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testMsWordCompTrailingBlanks)
{
+ return; // fails on aarch64
// The option is true in settings.xml
createSwDoc("MsWordCompTrailingBlanksTrue.odt");
SwDoc* pDoc = getSwDoc();
diff --git i/vcl/qa/cppunit/pdfexport/pdfexport.cxx w/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 7766c3aa3e76..bb00df6ba673 100644
--- i/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ w/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -392,6 +392,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868)
/// Tests that embedded video from Impress is not exported as a linked one.
CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105093)
{
+ return; // Failed to connect PipeWire event context (errno: 112)
vcl::filter::PDFDocument aDocument;
load(u"tdf105093.odp", aDocument);
diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index b9c560f422b5..e415b1fcc807 100644
--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby)
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum)
{
+ return; // fails due to missing font: Noto Sans Lao
saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt");
auto pPdfDocument = parsePDFExport();
diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg
index 1644b0d15514..cf429508bcd4 100644
--- 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>
diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx
index 956838656b28..70b38e4d59ba 100644
--- i/sc/qa/unit/subsequent_export_test2.cxx
@@ -197,29 +414,3 @@ index 956838656b28..70b38e4d59ba 100644
createScDoc();
ScDocument* pDoc = getScDoc();
diff --git i/sw/qa/extras/tiledrendering/tiledrendering.cxx w/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 4ebc4be96149..28ebf8c0d446 100644
--- i/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)
{
+ return;
addDarkLightThemes(COL_BLACK, COL_WHITE);
SwXTextDocument* pXTextDocument = createDoc();
int nFirstViewId = SfxLokHelper::getView();
diff --git i/vcl/qa/cppunit/complextext.cxx w/vcl/qa/cppunit/complextext.cxx
index 9be428b59128..b5a5493c53e8 100644
--- i/vcl/qa/cppunit/complextext.cxx
+++ w/vcl/qa/cppunit/complextext.cxx
@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510)
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104)
{
+ return;
+
ScopedVclPtrInstance<VirtualDevice> pOutDev;
vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } };
pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
+55 -10
View File
@@ -85,16 +85,6 @@
createDoc("shape.fodt");
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
// - Error: "2001-01-01" does not satisfy the "dateTime" type
// because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
loadAndReload("midnight_redline.fodt");
+ return; // fails on aarch64
xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
assertXPathContent(pXmlDoc,
--- a/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:46:52.202082763 +0100
+++ b/sdext/qa/unit/pdfimport.cxx 2025-03-22 14:49:22.947719369 +0100
@@ -785,6 +785,7 @@
@@ -115,6 +105,17 @@
aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
saveAsPDF(u"tdf164106.fodt");
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
{
+ return; // flaky
+
createSwDoc("tdf155177-1-min.odt");
uno::Reference<beans::XPropertySet> xStyle(
--- a/sw/qa/extras/layout/layout4.cxx
+++ b/sw/qa/extras/layout/layout4.cxx
@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL)
@@ -206,3 +207,47 @@
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
diff --git i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index b9c560f422b5..e415b1fcc807 100644
--- i/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ w/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -6320,6 +6320,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTextBoxRuby)
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf166044ContFootnoteOnlyOnePgNum)
{
+ return; // fails due to missing font: Noto Sans Lao
saveAsPDF(u"tdf166044-cont-footnote-one-pgnum.fodt");
auto pPdfDocument = parsePDFExport();
diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg
index 1644b0d15514..cf429508bcd4 100644
--- 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>
diff --git i/sc/qa/unit/subsequent_export_test2.cxx w/sc/qa/unit/subsequent_export_test2.cxx
index 956838656b28..70b38e4d59ba 100644
--- i/sc/qa/unit/subsequent_export_test2.cxx
+++ w/sc/qa/unit/subsequent_export_test2.cxx
@@ -100,6 +100,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringXLSX)
CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)
{
+ return;
// this doc is configured with CalcA1 ref syntax
createScDoc("xlsx/empty.xlsx");
@@ -137,6 +138,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringConfigXLSX)
CPPUNIT_TEST_FIXTURE(ScExportTest2, testRefStringUnspecified)
{
+ return;
createScDoc();
ScDocument* pDoc = getScDoc();
pkgs/applications/office/libreoffice/skip-broken-tests.patch
+54 -23
View File
@@ -20,18 +20,6 @@ index 231aea8d0f3c..214a23c82562 100644
LibLibreOffice_Impl aOffice;
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->initializeForRendering(pDocument, nullptr);
diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg
index 1644b0d15514..cf429508bcd4 100644
--- 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>
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index d8093e57a4e8..c95a742a68d3 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -83,19 +71,40 @@ index 6cf8f22647b9..12848713771b 100644
createSwWebDoc("outline-level.html");
// This was 0, HTML imported into Writer lost the outline numbering for
// Heading 1 styles.
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index e53d22c8fd1a..2f9decb0d931 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx
index b1b6c9cc9d23..3f920d00f996 100644
--- i/sw/qa/extras/layout/layout5.cxx
+++ w/sw/qa/extras/layout/layout5.cxx
@@ -721,6 +721,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf117028)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)
{
+ return; // flaky
+ return; // fails due to missing font: DejaVu Sans
createSwDoc("tdf106390.odt");
SwDocShell* pShell = getSwDocShell();
diff --git i/sw/qa/extras/layout/layout5.cxx w/sw/qa/extras/layout/layout5.cxx
index b1b6c9cc9d23..72990739711f 100644
--- i/sw/qa/extras/layout/layout5.cxx
+++ w/sw/qa/extras/layout/layout5.cxx
@@ -739,6 +739,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf106390)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)
{
+ return; // fails due to missing font: DejaVu Sans
+
createSwDoc("tdf155177-1-min.odt");
uno::Reference<beans::XPropertySet> xStyle(
createSwDoc("table-extrusion1.odt");
SwDocShell* pShell = getSwDocShell();
@@ -759,6 +761,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion1)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTableExtrusion2)
{
+ return; // fails due to missing font: DejaVu Sans
+
createSwDoc("table-extrusion2.odt");
SwDocShell* pShell = getSwDocShell();
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 794b3bd16ed4..3feaadd7a20f 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
@@ -162,6 +171,28 @@ index e37df27fd817..937c12e8c4c5 100644
// Regression test for bidi portion line breaking where the portion layout ends with underflow,
// but the bidi portion should not be truncated.
createSwDoc("tdf162314.fodt");
--- i/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ w/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1262,6 +1262,7 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testGetViewRenderState)
{
+ return;
addDarkLightThemes(COL_BLACK, COL_WHITE);
SwXTextDocument* pXTextDocument = createDoc();
int nFirstViewId = SfxLokHelper::getView();
--- i/vcl/qa/cppunit/complextext.cxx
+++ w/vcl/qa/cppunit/complextext.cxx
@@ -794,6 +794,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf165510)
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf154104)
{
+ return;
+
ScopedVclPtrInstance<VirtualDevice> pOutDev;
vcl::Font aBaseFont{ u"David Libre"_ustr, u"Regular"_ustr, Size{ 0, 72 } };
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-11-05 10:25:25.693126767 +0100
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 2025-11-05 10:27:38.216128865 +0100
@@ -5127,6 +5127,7 @@
pkgs/applications/office/libreoffice/src-collabora/deps.nix
Generated
+134 -113
View File
@@ -77,11 +77,11 @@
md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz";
}
{
name = "dtoa-20180411.tgz";
url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";
sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4";
name = "fast_float-8.1.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/fast_float-8.1.0.tar.gz";
sha256 = "4bfabb5979716995090ce68dce83f88f99629bc17ae280eae79311c5340143e1";
md5 = "";
md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
md5name = "4bfabb5979716995090ce68dce83f88f99629bc17ae280eae79311c5340143e1-fast_float-8.1.0.tar.gz";
}
{
name = "libcmis-0.6.2.tar.xz";
@@ -105,11 +105,11 @@
md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
}
{
name = "curl-8.12.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz";
sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202";
name = "curl-8.14.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz";
sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd";
md5 = "";
md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz";
md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@@ -140,18 +140,18 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz";
sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83";
name = "libetonyek-0.1.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz";
sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709";
md5 = "";
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz";
}
{
name = "expat-2.7.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz";
sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30";
name = "expat-2.7.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz";
sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0";
md5 = "";
md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz";
md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -161,11 +161,11 @@
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
}
{
name = "fontconfig-2.16.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.1.tar.xz";
sha256 = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a";
name = "fontconfig-2.16.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz";
sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2";
md5 = "";
md5name = "f4577b62f3a909597c9fb032c6a7a2ae39649ed8ce7048b615a48f32abc0d53a-fontconfig-2.16.1.tar.xz";
md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -413,11 +413,11 @@
md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip";
}
{
name = "ReemKufi-1.7.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip";
sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4";
name = "ReemKufi-1.8.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip";
sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc";
md5 = "";
md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip";
md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip";
}
{
name = "Scheherazade-2.100.zip";
@@ -497,11 +497,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.13.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz";
sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289";
name = "freetype-2.14.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.14.2.tar.xz";
sha256 = "4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1";
md5 = "";
md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz";
md5name = "4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1-freetype-2.14.2.tar.xz";
}
{
name = "frozen-1.2.0.tar.gz";
@@ -518,11 +518,11 @@
md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
}
{
name = "gpgme-1.24.2.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";
sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";
name = "gpgme-1.24.3.tar.bz2";
url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2";
sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd";
md5 = "";
md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";
md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2";
}
{
name = "graphite2-minimal-1.3.14.tgz";
@@ -672,11 +672,11 @@
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
}
{
name = "language-subtag-registry-2025-03-10.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2";
sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39";
name = "language-subtag-registry-2025-08-25.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2";
sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39";
md5 = "";
md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2";
md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
}
{
name = "lcms2-2.17.tar.gz";
@@ -693,11 +693,11 @@
md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2";
}
{
name = "libatomic_ops-7.8.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz";
sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51";
name = "libatomic_ops-7.8.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz";
sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5";
md5 = "";
md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz";
md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz";
}
{
name = "libeot-0.01.tar.bz2";
@@ -714,18 +714,18 @@
md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz";
}
{
name = "libffi-3.4.8.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.4.8.tar.gz";
sha256 = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b";
name = "libffi-3.5.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz";
sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc";
md5 = "";
md5name = "bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b-libffi-3.4.8.tar.gz";
md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";
}
{
name = "libgpg-error-1.53.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.53.tar.bz2";
sha256 = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f";
name = "libgpg-error-1.55.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2";
sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78";
md5 = "";
md5name = "6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f-libgpg-error-1.53.tar.bz2";
md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2";
}
{
name = "liblangtag-0.6.7.tar.bz2";
@@ -749,11 +749,11 @@
md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
}
{
name = "libwebp-1.5.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";
sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";
name = "libwebp-1.6.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz";
sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564";
md5 = "";
md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz";
md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz";
}
{
name = "xmlsec1-1.3.6.tar.gz";
@@ -763,11 +763,11 @@
md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";
}
{
name = "libxml2-2.13.7.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.13.7.tar.xz";
sha256 = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b";
name = "libxml2-2.14.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz";
sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a";
md5 = "";
md5name = "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b-libxml2-2.13.7.tar.xz";
md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz";
}
{
name = "libxslt-1.1.43.tar.xz";
@@ -784,18 +784,18 @@
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
{
name = "lxml-5.3.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.3.2.tar.gz";
sha256 = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1";
name = "lxml-5.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz";
sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd";
md5 = "";
md5name = "773947d0ed809ddad824b7b14467e1a481b8976e87278ac4a730c2f7c7fcddc1-lxml-5.3.2.tar.gz";
md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz";
}
{
name = "mariadb-connector-c-3.3.15-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz";
sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe";
name = "mariadb-connector-c-3.3.17-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz";
sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01";
md5 = "";
md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz";
md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
@@ -833,11 +833,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.102.1-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz";
sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65";
name = "nss-3.121-with-nspr-4.38.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.121-with-nspr-4.38.2.tar.gz";
sha256 = "76b9a1364bc4522abc652c4d676498d5062f502f64e38b32e9e2c7a3fff530f1";
md5 = "";
md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz";
md5name = "76b9a1364bc4522abc652c4d676498d5062f502f64e38b32e9e2c7a3fff530f1-nss-3.121-with-nspr-4.38.2.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@@ -854,11 +854,11 @@
md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
}
{
name = "officeotron-0.7.4-master.jar";
url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
md5 = "8249374c274932a21846fa7629c2aa9b";
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
name = "officeotron-0.8.8.jar";
url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.8.jar";
sha256 = "c72cdcb7fe7cfe917d1fb8766ddbc3f92b6124ecd5fb8c6dc0ddabb74a7e057c";
md5 = "";
md5name = "c72cdcb7fe7cfe917d1fb8766ddbc3f92b6124ecd5fb8c6dc0ddabb74a7e057c-officeotron-0.8.8.jar";
}
{
name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
@@ -868,18 +868,18 @@
md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
}
{
name = "openldap-2.6.9.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz";
sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff";
name = "openldap-2.6.10.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz";
sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516";
md5 = "";
md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";
}
{
name = "openssl-3.0.16.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
name = "openssl-3.0.19.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.19.tar.gz";
sha256 = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072";
md5 = "";
md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
md5name = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072-openssl-3.0.19.tar.gz";
}
{
name = "liborcus-0.19.2.tar.xz";
@@ -902,6 +902,20 @@
md5 = "";
md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2";
}
{
name = "afdko-4.0.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/afdko-4.0.2.tar.gz";
sha256 = "e1a31e871e83dd022635b852297c433c8e9c9d9d4f0c0f634e8d55dde28ad930";
md5 = "";
md5name = "e1a31e871e83dd022635b852297c433c8e9c9d9d4f0c0f634e8d55dde28ad930-afdko-4.0.2.tar.gz";
}
{
name = "antlr4-cpp-runtime-4.13.2-source.zip";
url = "https://dev-www.libreoffice.org/src/antlr4-cpp-runtime-4.13.2-source.zip";
sha256 = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4";
md5 = "";
md5name = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4-antlr4-cpp-runtime-4.13.2-source.zip";
}
{
name = "pixman-0.42.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz";
@@ -910,25 +924,25 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.47.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz";
sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631";
name = "libpng-1.6.55.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz";
sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d";
md5 = "";
md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz";
md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz";
}
{
name = "tiff-4.7.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
name = "tiff-4.7.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz";
sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba";
md5 = "";
md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz";
}
{
name = "poppler-25.01.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.01.0.tar.xz";
sha256 = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112";
name = "poppler-25.08.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";
sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";
md5 = "";
md5name = "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112-poppler-25.01.0.tar.xz";
md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -938,18 +952,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-14.17.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2";
sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1";
name = "postgresql-15.15.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-15.15.tar.bz2";
sha256 = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa";
md5 = "";
md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2";
md5name = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa-postgresql-15.15.tar.bz2";
}
{
name = "Python-3.10.17.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.10.17.tar.xz";
sha256 = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0";
name = "Python-3.10.19.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.10.19.tar.xz";
sha256 = "c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076";
md5 = "";
md5name = "4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0-Python-3.10.17.tar.xz";
md5name = "c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076-Python-3.10.19.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@@ -986,6 +1000,13 @@
md5 = "";
md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
}
{
name = "md4c-release-0.5.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/md4c-release-0.5.2.tar.gz";
sha256 = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21";
md5 = "";
md5name = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21-md4c-release-0.5.2.tar.gz";
}
{
name = "rhino-1.7.15.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip";
@@ -994,11 +1015,11 @@
md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";
}
{
name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d";
name = "skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz";
sha256 = "af3676facdf12d59a9ad5a0f63c60e6bb47f7d6bb243acdd0c6abc8c9b0b3c59";
md5 = "";
md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
md5name = "af3676facdf12d59a9ad5a0f63c60e6bb47f7d6bb243acdd0c6abc8c9b0b3c59-skia-m133-ecebe831881cdf52c65df518777210071f7970dd.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@@ -1015,11 +1036,11 @@
md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
}
{
name = "libvisio-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz";
sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b";
name = "libvisio-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz";
sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472";
md5 = "";
md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz";
md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz";
}
{
name = "libwpd-0.10.3.tar.xz";
@@ -1064,11 +1085,11 @@
md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
}
{
name = "zxcvbn-c-2.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz";
sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd";
name = "zxcvbn-c-2.6.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz";
sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a";
md5 = "";
md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz";
md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz";
}
{
name = "zxing-cpp-2.2.1.tar.gz";
pkgs/applications/office/libreoffice/src-collabora/help.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/help";
tag = "cp-25.04.1-1";
hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ=";
tag = "cp-25.04.9-4";
hash = "sha256-J2gtGU3YSgKnoGMALoPY1Bn2i8bU6KJM+aU7nmcAUIg=";
}
pkgs/applications/office/libreoffice/src-collabora/main.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/core";
tag = "cp-25.04.1-1";
hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk=";
tag = "cp-25.04.9-4";
hash = "sha256-9NE5GCIUUyinteFUBBkmV+ZwT7rfnVvynQqhumlYYEc=";
fetchSubmodules = false;
}
pkgs/applications/office/libreoffice/src-collabora/translations.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchgit, ... }:
fetchgit {
url = "https://gerrit.libreoffice.org/translations";
tag = "cp-25.04.1-1";
hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U=";
tag = "cp-25.04.9-4";
hash = "sha256-Axjw2uB3dCboOEUW7cLt8CQKjRC4sA2x+QOtgwD3aPU=";
}
pkgs/applications/office/libreoffice/src-collabora/version.nix
+1 -1
View File
@@ -1 +1 @@
"25.04.1-1"
"25.04.9-4"
pkgs/applications/office/libreoffice/src-fresh/deps.nix
Generated
+183 -141
View File
@@ -14,11 +14,11 @@
md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
}
{
name = "boost_1_88_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_88_0.tar.xz";
sha256 = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8";
name = "boost_1_89_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_89_0.tar.xz";
sha256 = "b3a976c659961f1d7fae9a8e58d6729a11f5473abaf2ef0e623f53777c86475d";
md5 = "";
md5name = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8-boost_1_88_0.tar.xz";
md5name = "b3a976c659961f1d7fae9a8e58d6729a11f5473abaf2ef0e623f53777c86475d-boost_1_89_0.tar.xz";
}
{
name = "box2d-2.4.1.tar.gz";
@@ -49,11 +49,11 @@
md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz";
}
{
name = "cairo-1.17.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz";
sha256 = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf";
name = "cairo-1.18.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/cairo-1.18.4.tar.xz";
sha256 = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb";
md5 = "";
md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz";
md5name = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb-cairo-1.18.4.tar.xz";
}
{
name = "libcdr-0.1.8.tar.xz";
@@ -77,11 +77,11 @@
md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz";
}
{
name = "dtoa-20180411.tgz";
url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";
sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4";
name = "fast_float-8.2.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/fast_float-8.2.2.tar.gz";
sha256 = "e64b5fff88e04959154adbd5fb83331d91f2e04ac06454671cdfcbdff172b158";
md5 = "";
md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz";
md5name = "e64b5fff88e04959154adbd5fb83331d91f2e04ac06454671cdfcbdff172b158-fast_float-8.2.2.tar.gz";
}
{
name = "libcmis-0.6.2.tar.xz";
@@ -140,18 +140,18 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz";
sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83";
name = "libetonyek-0.1.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz";
sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709";
md5 = "";
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz";
}
{
name = "expat-2.7.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz";
sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c";
name = "expat-2.7.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz";
sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0";
md5 = "";
md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz";
md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -217,11 +217,11 @@
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
name = "NotoKufiArabic-v2.109.zip";
url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip";
sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f";
name = "NotoKufiArabic-v2.110.zip";
url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.110.zip";
sha256 = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df";
md5 = "";
md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
md5name = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df-NotoKufiArabic-v2.110.zip";
}
{
name = "NotoSans-v2.015.zip";
@@ -252,11 +252,11 @@
md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip";
}
{
name = "NotoNaskhArabic-v2.019.zip";
url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip";
sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81";
name = "NotoNaskhArabic-v2.021.zip";
url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.021.zip";
sha256 = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032";
md5 = "";
md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip";
md5name = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032-NotoNaskhArabic-v2.021.zip";
}
{
name = "NotoSansHebrew-v3.001.zip";
@@ -343,11 +343,11 @@
md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip";
}
{
name = "ReemKufi-1.8.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip";
sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc";
name = "ReemKufi-2.0.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-2.0.zip";
sha256 = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0";
md5 = "";
md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip";
md5name = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0-ReemKufi-2.0.zip";
}
{
name = "Scheherazade-2.100.zip";
@@ -427,11 +427,11 @@
md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz";
}
{
name = "glm-1.0.1.zip";
url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip";
sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5";
name = "glm-1.0.3.zip";
url = "https://dev-www.libreoffice.org/src/glm-1.0.3.zip";
sha256 = "3aa4347b8f13cba882df1c7b61a6ca910c75a875c56ec3d75d7dc9ae8eac34df";
md5 = "";
md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
md5name = "3aa4347b8f13cba882df1c7b61a6ca910c75a875c56ec3d75d7dc9ae8eac34df-glm-1.0.3.zip";
}
{
name = "gpgme-1.24.3.tar.bz2";
@@ -448,11 +448,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-11.5.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz";
sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1";
name = "harfbuzz-12.3.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-12.3.2.tar.xz";
sha256 = "6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8";
md5 = "";
md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz";
md5name = "6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8-harfbuzz-12.3.2.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@@ -483,18 +483,18 @@
md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
}
{
name = "icu4c-77_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-77_1-src.tgz";
sha256 = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061";
name = "icu4c-78.2-sources.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-78.2-sources.tgz";
sha256 = "3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35";
md5 = "";
md5name = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061-icu4c-77_1-src.tgz";
md5name = "3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35-icu4c-78.2-sources.tgz";
}
{
name = "icu4c-77_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-77_1-data.zip";
sha256 = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3";
name = "icu4c-78.2-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-78.2-data.zip";
sha256 = "582968cf174c9498b2046b4f4e7f786def5f18222bd8d98432d7a29399c38c70";
md5 = "";
md5name = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3-icu4c-77_1-data.zip";
md5name = "582968cf174c9498b2046b4f4e7f786def5f18222bd8d98432d7a29399c38c70-icu4c-78.2-data.zip";
}
{
name = "Java-WebSocket-1.6.0.tar.gz";
@@ -581,11 +581,11 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
name = "libjpeg-turbo-3.1.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz";
sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6";
name = "libjpeg-turbo-3.1.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.3.tar.gz";
sha256 = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5";
md5 = "";
md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz";
md5name = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5-libjpeg-turbo-3.1.3.tar.gz";
}
{
name = "language-subtag-registry-2025-08-25.tar.bz2";
@@ -595,11 +595,11 @@
md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
}
{
name = "lcms2-2.17.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz";
sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074";
name = "lcms2-2.18.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.18.tar.gz";
sha256 = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347";
md5 = "";
md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz";
md5name = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347-lcms2-2.18.tar.gz";
}
{
name = "libassuan-3.0.2.tar.bz2";
@@ -609,11 +609,11 @@
md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2";
}
{
name = "libatomic_ops-7.8.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz";
sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5";
name = "libatomic_ops-7.10.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.10.0.tar.gz";
sha256 = "0db3ebff755db170f65e74a64ec4511812e9ee3185c232eeffeacd274190dfb0";
md5 = "";
md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz";
md5name = "0db3ebff755db170f65e74a64ec4511812e9ee3185c232eeffeacd274190dfb0-libatomic_ops-7.10.0.tar.gz";
}
{
name = "libeot-0.01.tar.bz2";
@@ -637,18 +637,18 @@
md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";
}
{
name = "libgpg-error-1.55.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2";
sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78";
name = "libgpg-error-1.59.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.59.tar.bz2";
sha256 = "a19bc5087fd97026d93cb4b45d51638d1a25202a5e1fbc3905799f424cfa6134";
md5 = "";
md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2";
md5name = "a19bc5087fd97026d93cb4b45d51638d1a25202a5e1fbc3905799f424cfa6134-libgpg-error-1.59.tar.bz2";
}
{
name = "liblangtag-0.6.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2";
sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e";
name = "liblangtag-0.6.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.8.tar.bz2";
sha256 = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2";
md5 = "";
md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2";
md5name = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2-liblangtag-0.6.8.tar.bz2";
}
{
name = "libnumbertext-1.0.11.tar.xz";
@@ -672,11 +672,11 @@
md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz";
}
{
name = "xmlsec1-1.3.7.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.7.tar.gz";
sha256 = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea";
name = "xmlsec1-1.3.9.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.9.tar.gz";
sha256 = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f";
md5 = "";
md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz";
md5name = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f-xmlsec1-1.3.9.tar.gz";
}
{
name = "libxml2-2.14.6.tar.xz";
@@ -686,11 +686,11 @@
md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz";
}
{
name = "libxslt-1.1.43.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz";
sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a";
name = "libxslt-1.1.45.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.45.tar.xz";
sha256 = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e";
md5 = "";
md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz";
md5name = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e-libxslt-1.1.45.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -707,11 +707,18 @@
md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz";
}
{
name = "mariadb-connector-c-3.3.17-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz";
sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01";
name = "xz-5.8.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/xz-5.8.2.tar.gz";
sha256 = "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1";
md5 = "";
md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz";
md5name = "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1-xz-5.8.2.tar.gz";
}
{
name = "mariadb-connector-c-3.3.18-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.18-src.tar.gz";
sha256 = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5";
md5 = "";
md5name = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5-mariadb-connector-c-3.3.18-src.tar.gz";
}
{
name = "mdds-3.1.0.tar.xz";
@@ -756,11 +763,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.116-with-nspr-4.37.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.116-with-nspr-4.37.tar.gz";
sha256 = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10";
name = "nss-3.119.1-with-nspr-4.38.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.119.1-with-nspr-4.38.2.tar.gz";
sha256 = "1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b";
md5 = "";
md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz";
md5name = "1e86aacdce66c3bdd38bb011e617a3c93013ed6f802102365a589d6f686efe4b-nss-3.119.1-with-nspr-4.38.2.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@@ -777,11 +784,11 @@
md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
}
{
name = "officeotron-0.7.4-master.jar";
url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
md5 = "8249374c274932a21846fa7629c2aa9b";
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
name = "officeotron-0.8.5.jar";
url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.5.jar";
sha256 = "0c2a4227394ac78147387f1c1ff1063e87f2151ffc91f1eb97bb17c2650fa708";
md5 = "";
md5name = "0c2a4227394ac78147387f1c1ff1063e87f2151ffc91f1eb97bb17c2650fa708-officeotron-0.8.5.jar";
}
{
name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
@@ -791,25 +798,25 @@
md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
}
{
name = "openldap-2.6.10.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz";
sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516";
name = "openldap-2.6.12.tgz";
url = "https://dev-www.libreoffice.org/src/openldap-2.6.12.tgz";
sha256 = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e";
md5 = "";
md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";
md5name = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e-openldap-2.6.12.tgz";
}
{
name = "openssl-3.0.18.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz";
sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b";
name = "openssl-3.5.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.5.5.tar.gz";
sha256 = "b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89";
md5 = "";
md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz";
md5name = "b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89-openssl-3.5.5.tar.gz";
}
{
name = "liborcus-0.20.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.20.1.tar.xz";
sha256 = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27";
name = "liborcus-0.21.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.21.0.tar.xz";
sha256 = "1c6e473d6b8a63d61d0e6874a1762d6f0e0e78338d763e48ac93126ecde19b37";
md5 = "";
md5name = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27-liborcus-0.20.1.tar.xz";
md5name = "1c6e473d6b8a63d61d0e6874a1762d6f0e0e78338d763e48ac93126ecde19b37-liborcus-0.21.0.tar.xz";
}
{
name = "libpagemaker-0.0.4.tar.xz";
@@ -819,25 +826,39 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-7012.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2";
sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd";
name = "pdfium-7471.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-7471.tar.bz2";
sha256 = "7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5";
md5 = "";
md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2";
md5name = "7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5-pdfium-7471.tar.bz2";
}
{
name = "pixman-0.42.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz";
sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e";
name = "afdko-4.0.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/afdko-4.0.3.tar.gz";
sha256 = "5feed7c2468e25b25fce0479c04af07f4ed2680bc9251bb4c4aef9ec2fba5720";
md5 = "";
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
md5name = "5feed7c2468e25b25fce0479c04af07f4ed2680bc9251bb4c4aef9ec2fba5720-afdko-4.0.3.tar.gz";
}
{
name = "libpng-1.6.50.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz";
sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307";
name = "antlr4-cpp-runtime-4.13.2-source.zip";
url = "https://dev-www.libreoffice.org/src/antlr4-cpp-runtime-4.13.2-source.zip";
sha256 = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4";
md5 = "";
md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";
md5name = "0ed13668906e86dbc0dcddf30fdee68c10203dea4e83852b4edb810821bee3c4-antlr4-cpp-runtime-4.13.2-source.zip";
}
{
name = "pixman-0.46.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/pixman-0.46.4.tar.xz";
sha256 = "a098c33924754ad43f981b740f6d576c70f9ed1006e12221b1845431ebce1239";
md5 = "";
md5name = "a098c33924754ad43f981b740f6d576c70f9ed1006e12221b1845431ebce1239-pixman-0.46.4.tar.xz";
}
{
name = "libpng-1.6.55.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz";
sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d";
md5 = "";
md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz";
}
{
name = "tiff-4.7.1.tar.xz";
@@ -847,11 +868,11 @@
md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz";
}
{
name = "poppler-25.09.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz";
sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658";
name = "poppler-26.01.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-26.01.0.tar.xz";
sha256 = "1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089";
md5 = "";
md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz";
md5name = "1cb944a4b88847f5fb6551683bc799db59f04990f5d8be07aba2acbf38601089-poppler-26.01.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -861,18 +882,18 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-15.14.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-15.14.tar.bz2";
sha256 = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2";
name = "postgresql-15.15.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-15.15.tar.bz2";
sha256 = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa";
md5 = "";
md5name = "06dd75d305cd3870ee62b3932e661c624543eaf9ae2ba37cdec0a4f8edd051d2-postgresql-15.14.tar.bz2";
md5name = "5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa-postgresql-15.15.tar.bz2";
}
{
name = "Python-3.11.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.11.13.tar.xz";
sha256 = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a";
name = "Python-3.12.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.12.12.tar.xz";
sha256 = "fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4";
md5 = "";
md5name = "8fb5f9fbc7609fa822cb31549884575db7fd9657cbffb89510b5d7975963a83a-Python-3.11.13.tar.xz";
md5name = "fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4-Python-3.12.12.tar.xz";
}
{
name = "python.3.12.8.nupkg";
@@ -917,18 +938,32 @@
md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
}
{
name = "rhino-1.7.15.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip";
sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa";
name = "md4c-release-0.5.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/md4c-release-0.5.2.tar.gz";
sha256 = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21";
md5 = "";
md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";
md5name = "55d0111d48fb11883aaee91465e642b8b640775a4d6993c2d0e7a8092758ef21-md4c-release-0.5.2.tar.gz";
}
{
name = "skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
sha256 = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25";
name = "rhino-1.7.15.1.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.1.zip";
sha256 = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad";
md5 = "";
md5name = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25-skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
md5name = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad-rhino-1.7.15.1.zip";
}
{
name = "skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz";
sha256 = "45ae58e84fa2d1e261bfc980e1c5b7bbfaf83887e3813795bd343d3786f4d0bc";
md5 = "";
md5name = "45ae58e84fa2d1e261bfc980e1c5b7bbfaf83887e3813795bd343d3786f4d0bc-skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.tar.xz";
}
{
name = "sqlite-amalgamation-3510200.zip";
url = "https://dev-www.libreoffice.org/src/sqlite-amalgamation-3510200.zip";
sha256 = "6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec";
md5 = "";
md5name = "6e2a845a493026bdbad0618b2b5a0cf48584faab47384480ed9f592d912f23ec-sqlite-amalgamation-3510200.zip";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@@ -945,11 +980,11 @@
md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
}
{
name = "libvisio-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz";
sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b";
name = "libvisio-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz";
sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472";
md5 = "";
md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz";
md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz";
}
{
name = "libwpd-0.10.3.tar.xz";
@@ -980,11 +1015,18 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.3.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.1.tar.xz";
sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32";
name = "y-crdt-0.23.5.tar.gz";
url = "https://dev-www.libreoffice.org/src/y-crdt-0.23.5.tar.gz";
sha256 = "67c02f1b74fda33bcc824a310028c100ce2a84b6e63ade46ae1a3258e867a225";
md5 = "";
md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz";
md5name = "67c02f1b74fda33bcc824a310028c100ce2a84b6e63ade46ae1a3258e867a225-y-crdt-0.23.5.tar.gz";
}
{
name = "zlib-1.3.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.3.2.tar.xz";
sha256 = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3";
md5 = "";
md5name = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3-zlib-1.3.2.tar.xz";
}
{
name = "zstd-1.5.7.tar.gz";
pkgs/applications/office/libreoffice/src-fresh/help.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz";
sha256 = "0s15v57xn936mwxrksfc2xy5pfr7jphfiw8ihhij3sxjq4qr49ys";
url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-help-26.2.1.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/main.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz";
sha256 = "0a7wx3slnnbvql59dihby5gb57xbdxm29qiw1dqkfapvfdgj5khq";
url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-26.2.1.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/translations.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz";
sha256 = "0hwim8sz9kf802svnv1py4fw4pv9n0ilk5k1r2801r843vlxsy2c";
url = "https://download.documentfoundation.org/libreoffice/src/26.2.1/libreoffice-translations-26.2.1.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-fresh/version.nix
+1 -1
View File
@@ -1 +1 @@
"25.8.2.2"
"26.2.1.2"
pkgs/applications/office/libreoffice/src-still/deps.nix
Generated
+170 -149
View File
@@ -14,11 +14,11 @@
md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
}
{
name = "boost_1_86_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz";
sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c";
name = "boost_1_88_0.tar.xz";
url = "https://dev-www.libreoffice.org/src/boost_1_88_0.tar.xz";
sha256 = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8";
md5 = "";
md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz";
md5name = "5c67a448c562f1606e38203ba7ed7e8d7453581b6b9ca324e96205eae0da5ff8-boost_1_88_0.tar.xz";
}
{
name = "box2d-2.4.1.tar.gz";
@@ -140,18 +140,18 @@
md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
}
{
name = "libetonyek-0.1.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.12.tar.xz";
sha256 = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83";
name = "libetonyek-0.1.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.13.tar.xz";
sha256 = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709";
md5 = "";
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
md5name = "032b71cb597edd92a0b270b916188281bc35be55296b263f6817b29adbcb1709-libetonyek-0.1.13.tar.xz";
}
{
name = "expat-2.7.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz";
sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30";
name = "expat-2.7.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.7.4.tar.xz";
sha256 = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0";
md5 = "";
md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz";
md5name = "9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0-expat-2.7.4.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -161,11 +161,11 @@
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
}
{
name = "fontconfig-2.16.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz";
sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2";
name = "fontconfig-2.17.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/fontconfig-2.17.1.tar.xz";
sha256 = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541";
md5 = "";
md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz";
md5name = "9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541-fontconfig-2.17.1.tar.xz";
}
{
name = "crosextrafonts-20130214.tar.gz";
@@ -217,11 +217,11 @@
md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
}
{
name = "NotoKufiArabic-v2.109.zip";
url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip";
sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f";
name = "NotoKufiArabic-v2.110.zip";
url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.110.zip";
sha256 = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df";
md5 = "";
md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip";
md5name = "34390882c196f032811f2a3db8982c1e839f69aae3e4c2c1fdd63203150690df-NotoKufiArabic-v2.110.zip";
}
{
name = "NotoSans-v2.015.zip";
@@ -252,11 +252,11 @@
md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip";
}
{
name = "NotoNaskhArabic-v2.019.zip";
url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip";
sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81";
name = "NotoNaskhArabic-v2.021.zip";
url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.021.zip";
sha256 = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032";
md5 = "";
md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip";
md5name = "6c050ab9bd087d69b733c505a7576e60c528c2f33cd7b91005a5bd7da4514032-NotoNaskhArabic-v2.021.zip";
}
{
name = "NotoSansHebrew-v3.001.zip";
@@ -343,11 +343,11 @@
md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip";
}
{
name = "ReemKufi-1.8.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip";
sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc";
name = "ReemKufi-2.0.zip";
url = "https://dev-www.libreoffice.org/src/ReemKufi-2.0.zip";
sha256 = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0";
md5 = "";
md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip";
md5name = "94ae468fd88f37011607f03466bfc3a03fb617682b7bac6419b70de94cac22f0-ReemKufi-2.0.zip";
}
{
name = "Scheherazade-2.100.zip";
@@ -413,11 +413,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
}
{
name = "freetype-2.13.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz";
sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289";
name = "freetype-2.14.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/freetype-2.14.1.tar.xz";
sha256 = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc";
md5 = "";
md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz";
md5name = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc-freetype-2.14.1.tar.xz";
}
{
name = "frozen-1.2.0.tar.gz";
@@ -427,11 +427,11 @@
md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz";
}
{
name = "glm-1.0.1.zip";
url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip";
sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5";
name = "glm-1.0.2.zip";
url = "https://dev-www.libreoffice.org/src/glm-1.0.2.zip";
sha256 = "be64032585415ca7dbea0d614915bb8eec012adf7b4d4fea7ff6b5bd3e0b906a";
md5 = "";
md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
md5name = "be64032585415ca7dbea0d614915bb8eec012adf7b4d4fea7ff6b5bd3e0b906a-glm-1.0.2.zip";
}
{
name = "gpgme-1.24.3.tar.bz2";
@@ -448,11 +448,11 @@
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
}
{
name = "harfbuzz-8.5.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz";
sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27";
name = "harfbuzz-12.3.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/harfbuzz-12.3.0.tar.xz";
sha256 = "8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7";
md5 = "";
md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz";
md5name = "8660ebd3c27d9407fc8433b5d172bafba5f0317cb0bb4339f28e5370c93d42b7-harfbuzz-12.3.0.tar.xz";
}
{
name = "hsqldb_1_8_0.zip";
@@ -483,18 +483,18 @@
md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
}
{
name = "icu4c-75_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz";
sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef";
name = "icu4c-77_1-src.tgz";
url = "https://dev-www.libreoffice.org/src/icu4c-77_1-src.tgz";
sha256 = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061";
md5 = "";
md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz";
md5name = "588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061-icu4c-77_1-src.tgz";
}
{
name = "icu4c-75_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip";
sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1";
name = "icu4c-77_1-data.zip";
url = "https://dev-www.libreoffice.org/src/icu4c-77_1-data.zip";
sha256 = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3";
md5 = "";
md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip";
md5name = "1e08bfafa442260ccabf9a872d4eab12de813d42b90769df056bab032b37e1d3-icu4c-77_1-data.zip";
}
{
name = "Java-WebSocket-1.6.0.tar.gz";
@@ -581,11 +581,11 @@
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
}
{
name = "libjpeg-turbo-2.1.5.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz";
sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf";
name = "libjpeg-turbo-3.1.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.3.tar.gz";
sha256 = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5";
md5 = "";
md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
md5name = "3a13a5ba767dc8264bc40b185e41368a80d5d5f945944d1dbaa4b2fb0099f4e5-libjpeg-turbo-3.1.3.tar.gz";
}
{
name = "language-subtag-registry-2025-08-25.tar.bz2";
@@ -595,11 +595,11 @@
md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
}
{
name = "lcms2-2.17.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz";
sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074";
name = "lcms2-2.18.tar.gz";
url = "https://dev-www.libreoffice.org/src/lcms2-2.18.tar.gz";
sha256 = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347";
md5 = "";
md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz";
md5name = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347-lcms2-2.18.tar.gz";
}
{
name = "libassuan-3.0.2.tar.bz2";
@@ -609,11 +609,11 @@
md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2";
}
{
name = "libatomic_ops-7.8.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz";
sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51";
name = "libatomic_ops-7.8.4.tar.gz";
url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz";
sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5";
md5 = "";
md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz";
md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz";
}
{
name = "libeot-0.01.tar.bz2";
@@ -637,18 +637,18 @@
md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";
}
{
name = "libgpg-error-1.55.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.55.tar.bz2";
sha256 = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78";
name = "libgpg-error-1.56.tar.bz2";
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.56.tar.bz2";
sha256 = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0";
md5 = "";
md5name = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78-libgpg-error-1.55.tar.bz2";
md5name = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0-libgpg-error-1.56.tar.bz2";
}
{
name = "liblangtag-0.6.7.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2";
sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e";
name = "liblangtag-0.6.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.8.tar.bz2";
sha256 = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2";
md5 = "";
md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2";
md5name = "a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2-liblangtag-0.6.8.tar.bz2";
}
{
name = "libnumbertext-1.0.11.tar.xz";
@@ -672,25 +672,25 @@
md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz";
}
{
name = "xmlsec1-1.3.6.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz";
sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f";
name = "xmlsec1-1.3.9.tar.gz";
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.9.tar.gz";
sha256 = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f";
md5 = "";
md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";
md5name = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f-xmlsec1-1.3.9.tar.gz";
}
{
name = "libxml2-2.14.5.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz";
sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b";
name = "libxml2-2.14.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz";
sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a";
md5 = "";
md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz";
md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz";
}
{
name = "libxslt-1.1.43.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.43.tar.xz";
sha256 = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a";
name = "libxslt-1.1.45.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxslt-1.1.45.tar.xz";
sha256 = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e";
md5 = "";
md5name = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a-libxslt-1.1.43.tar.xz";
md5name = "9acfe68419c4d06a45c550321b3212762d92f41465062ca4ea19e632ee5d216e-libxslt-1.1.45.tar.xz";
}
{
name = "lp_solve_5.5.tar.gz";
@@ -700,25 +700,25 @@
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
}
{
name = "lxml-5.4.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-5.4.0.tar.gz";
sha256 = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd";
name = "lxml-6.0.2.tar.gz";
url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz";
sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62";
md5 = "";
md5name = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd-lxml-5.4.0.tar.gz";
md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz";
}
{
name = "mariadb-connector-c-3.3.15-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz";
sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe";
name = "mariadb-connector-c-3.3.18-src.tar.gz";
url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.18-src.tar.gz";
sha256 = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5";
md5 = "";
md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz";
md5name = "292c0f2e6ce5cb6f1217f3a53c72f792e55fb20393e00924b11943e2f9f6e9d5-mariadb-connector-c-3.3.18-src.tar.gz";
}
{
name = "mdds-2.1.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz";
sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56";
name = "mdds-3.1.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/mdds-3.1.0.tar.xz";
sha256 = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c";
md5 = "";
md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz";
md5name = "ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c-mdds-3.1.0.tar.xz";
}
{
name = "mDNSResponder-878.200.35.tar.gz";
@@ -727,6 +727,13 @@
md5 = "";
md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz";
}
{
name = "meson-1.8.3.tar.gz";
url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz";
sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf";
md5 = "";
md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz";
}
{
name = "libmspub-0.1.4.tar.xz";
url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";
@@ -749,11 +756,11 @@
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
}
{
name = "nss-3.102.1-with-nspr-4.35.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz";
sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65";
name = "nss-3.118.1-with-nspr-4.37.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.118.1-with-nspr-4.37.tar.gz";
sha256 = "9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15";
md5 = "";
md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz";
md5name = "9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15-nss-3.118.1-with-nspr-4.37.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@@ -770,11 +777,11 @@
md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar";
}
{
name = "officeotron-0.7.4-master.jar";
url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770";
md5 = "8249374c274932a21846fa7629c2aa9b";
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
name = "officeotron-0.8.4.jar";
url = "https://dev-www.libreoffice.org/src/../extern/officeotron-0.8.4.jar";
sha256 = "567b9579510969e34085ed30995d87b27a11584f03711d7fc9b7ec2e1cea36c5";
md5 = "";
md5name = "567b9579510969e34085ed30995d87b27a11584f03711d7fc9b7ec2e1cea36c5-officeotron-0.8.4.jar";
}
{
name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
@@ -791,18 +798,18 @@
md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";
}
{
name = "openssl-3.0.17.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz";
sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce";
name = "openssl-3.0.19.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-3.0.19.tar.gz";
sha256 = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072";
md5 = "";
md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";
md5name = "fa5a4143b8aae18be53ef2f3caf29a2e0747430b8bc74d32d88335b94ab63072-openssl-3.0.19.tar.gz";
}
{
name = "liborcus-0.19.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz";
sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39";
name = "liborcus-0.20.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/liborcus-0.20.1.tar.xz";
sha256 = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27";
md5 = "";
md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz";
md5name = "ec27f30e8445a2a3f307f7e829fc446fd48193150b7f8f23bb5bfb25ec6e4e27-liborcus-0.20.1.tar.xz";
}
{
name = "libpagemaker-0.0.4.tar.xz";
@@ -812,11 +819,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-6764.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2";
sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49";
name = "pdfium-7012.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-7012.tar.bz2";
sha256 = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd";
md5 = "";
md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2";
md5name = "e647ca4fcc2c91d9dca717452e1b1be1ab6155ac4977dca716041652c7b10bdd-pdfium-7012.tar.bz2";
}
{
name = "pixman-0.42.2.tar.gz";
@@ -826,25 +833,25 @@
md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
}
{
name = "libpng-1.6.50.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz";
sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307";
name = "libpng-1.6.55.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.55.tar.xz";
sha256 = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d";
md5 = "";
md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";
md5name = "d925722864837ad5ae2a82070d4b2e0603dc72af44bd457c3962298258b8e82d-libpng-1.6.55.tar.xz";
}
{
name = "tiff-4.7.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
name = "tiff-4.7.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz";
sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba";
md5 = "";
md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz";
}
{
name = "poppler-25.08.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";
sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";
name = "poppler-25.12.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-25.12.0.tar.xz";
sha256 = "c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48";
md5 = "";
md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
md5name = "c18b40eb36b1a0c5b86e29ca054bf0770304583da4f2cdd42fe86eca6a20de48-poppler-25.12.0.tar.xz";
}
{
name = "poppler-data-0.4.12.tar.gz";
@@ -854,18 +861,25 @@
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
}
{
name = "postgresql-14.19.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2";
sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80";
name = "postgresql-15.16.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-15.16.tar.bz2";
sha256 = "695ee29a77be1f5010e10f3667696f29871587f7aa311eadc1f809bea287cf48";
md5 = "";
md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2";
md5name = "695ee29a77be1f5010e10f3667696f29871587f7aa311eadc1f809bea287cf48-postgresql-15.16.tar.bz2";
}
{
name = "Python-3.10.18.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz";
sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f";
name = "Python-3.11.14.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.11.14.tar.xz";
sha256 = "8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78";
md5 = "";
md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz";
md5name = "8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78-Python-3.11.14.tar.xz";
}
{
name = "python.3.12.8.nupkg";
url = "https://dev-www.libreoffice.org/src/python.3.12.8.nupkg";
sha256 = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d";
md5 = "";
md5name = "406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d-python.3.12.8.nupkg";
}
{
name = "libqxp-0.0.2.tar.xz";
@@ -903,18 +917,18 @@
md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
}
{
name = "rhino-1.7.15.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip";
sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa";
name = "rhino-1.7.15.1.zip";
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.1.zip";
sha256 = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad";
md5 = "";
md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";
md5name = "65599965d82c0e60332601d511dacb0241e796cabfa5550c72bb80c4bf89e8ad-rhino-1.7.15.1.zip";
}
{
name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d";
name = "skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
url = "https://dev-www.libreoffice.org/src/skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
sha256 = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25";
md5 = "";
md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
md5name = "2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25-skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz";
}
{
name = "libstaroffice-0.0.7.tar.xz";
@@ -931,11 +945,11 @@
md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
}
{
name = "libvisio-0.1.8.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.8.tar.xz";
sha256 = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b";
name = "libvisio-0.1.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/libvisio-0.1.10.tar.xz";
sha256 = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472";
md5 = "";
md5name = "b4098ffbf4dcb9e71213fa0acddbd928f27bed30db2d80234813b15d53d0405b-libvisio-0.1.8.tar.xz";
md5name = "9e9eff75112d4d92d92262ad7fc2599c21e26f8fc5ba54900efdc83c0501e472-libvisio-0.1.10.tar.xz";
}
{
name = "libwpd-0.10.3.tar.xz";
@@ -972,6 +986,13 @@
md5 = "";
md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz";
}
{
name = "zstd-1.5.7.tar.gz";
url = "https://dev-www.libreoffice.org/src/zstd-1.5.7.tar.gz";
sha256 = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3";
md5 = "";
md5name = "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3-zstd-1.5.7.tar.gz";
}
{
name = "libzmf-0.0.2.tar.xz";
url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
@@ -987,10 +1008,10 @@
md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz";
}
{
name = "zxing-cpp-2.2.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz";
sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635";
name = "zxing-cpp-2.3.0.tar.gz";
url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.3.0.tar.gz";
sha256 = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba";
md5 = "";
md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz";
md5name = "64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba-zxing-cpp-2.3.0.tar.gz";
}
]
pkgs/applications/office/libreoffice/src-still/help.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz";
sha256 = "1wn5qv1xblv8bff9zf484xi76ycsjswm93p4v09n42j10ai9qhxn";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-help-25.8.5.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/main.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz";
sha256 = "1bwiqwr98jhjlxphw8q0zlbrfn6ihk0s3izanskjm1lqs27xqqvz";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-25.8.5.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/translations.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, ... }:
fetchurl {
sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh";
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz";
sha256 = "0im4g4gxx4zvv0csdcmzinm0vp8lxpz57dlclhnbxkasnh1y9vji";
url = "https://download.documentfoundation.org/libreoffice/src/25.8.5/libreoffice-translations-25.8.5.2.tar.xz";
}
pkgs/applications/office/libreoffice/src-still/version.nix
+1 -1
View File
@@ -1 +1 @@
"25.2.6.2"
"25.8.5.2"
pkgs/applications/office/libreoffice/update.sh
+2 -1
View File
@@ -83,6 +83,7 @@ case $variant in
rev=$(grep --perl-regexp --only-matching --max-count=1 \
'\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags")
full_version=${rev#refs/tags/cp-}
tag=${rev#refs/tags/}
echoerr full version is $full_version
echo \"$full_version\" > version.nix
@@ -98,7 +99,7 @@ case $variant in
echo "{ fetchgit, ... }:" > $t.nix
echo "fetchgit {" >> $t.nix
echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix
echo " rev = \"$rev\";" >> $t.nix
echo " tag = \"$tag\";" >> $t.nix
echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix
echo "}" >> "$t.nix"
done
pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "obs-command-source";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-command-source";
rev = version;
sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28=";
sha256 = "sha256-z5TKVA0WI/pqfca1VCXfDvYHxDG2EoD6PFCV7pSXe7c=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/ai/air/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "air";
version = "1.64.5";
version = "1.65.0";
src = fetchFromGitHub {
owner = "air-verse";
repo = "air";
tag = "v${finalAttrs.version}";
hash = "sha256-vaNXG+bS+RB0Qi0kI9lBGyr8FcUxm5igG982+cOZwqw=";
hash = "sha256-pqvnX/PiipZM8jLBN6zN/yVnuCCk+aTII5AH0N4nHEM=";
};
vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw=";
pkgs/by-name/am/amdgpu_top/package.nix
+3 -3
View File
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "amdgpu_top";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "Umio-Yasuno";
repo = "amdgpu_top";
tag = "v${finalAttrs.version}";
hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc=";
hash = "sha256-k+/y8YaEP8DJuW8n/Xq/Ea9DWG79Cux+PgZbSP4m3pQ=";
};
cargoHash = "sha256-hQrgAyi7740bY5knICWACZhDYoZwPs/dO/PgVC4Krx0=";
cargoHash = "sha256-+eMItSemE69UGfGF9CeKyEvUxvhiZjkJJPeZoVfa+dk=";
buildInputs = [
libdrm
pkgs/by-name/an/android-image-kitchen/0001-Use-PATH-to-find-programs.patch
+224
View File
@@ -0,0 +1,224 @@
From bb95a9794abc077ef29066ab6e769fee564c5592 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 12 Feb 2026 14:57:40 +0100
Subject: [PATCH 1/2] Use $PATH to find programs
Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
cleanup.sh | 3 ---
repackimg.sh | 30 ++++++++++++++----------------
unpackimg.sh | 32 +++++++++++++++-----------------
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/cleanup.sh b/cleanup.sh
index 159d04c..b262c73 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -23,9 +23,6 @@ case $1 in
*) cd "$aik";;
esac;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
-
if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then
sudo=sudo;
fi;
diff --git a/repackimg.sh b/repackimg.sh
index 185a180..d5e7bc4 100755
--- a/repackimg.sh
+++ b/repackimg.sh
@@ -49,8 +49,6 @@ case $1 in
--local) shift;;
*) cd "$aik";;
esac;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then
echo "No files found to be packed/built.";
@@ -135,8 +133,8 @@ else
xz) repackcmd="xz $level -Ccrc32";;
lzma) repackcmd="xz $level -Flzma";;
bzip2) compext=bz2;;
- lz4) repackcmd="$bin/$arch/lz4 $level";;
- lz4-l) repackcmd="$bin/$arch/lz4 $level -l"; compext=lz4;;
+ lz4) repackcmd="lz4 $level";;
+ lz4-l) repackcmd="lz4 $level -l"; compext=lz4;;
cpio) repackcmd="cat"; compext="";;
*) abort; exit 1;;
esac;
@@ -263,7 +261,7 @@ if [ -f split_img/*-mtktype ]; then
echo "Generating MTK headers...";
echo " ";
echo "Using ramdisk type: $mtktype";
- "$bin/$arch/mkmtkhdr" --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null;
+ mkmtkhdr --kernel "$kernel" --$mtktype "$ramdisk" >/dev/null;
if [ ! $? -eq "0" ]; then
abort;
exit 1;
@@ -293,18 +291,18 @@ echo " ";
echo "Using format: $imgtype";
echo " ";
case $imgtype in
- AOSP_VNDR) "$bin/$arch/mkbootimg" --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;;
- AOSP) "$bin/$arch/mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;;
- AOSP-PXA) "$bin/$arch/pxa-mkbootimg" --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;;
- ELF) "$bin/$arch/elftool" pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;;
- KRNL) "$bin/$arch/rkcrc" -k "$ramdisk" $outname;;
+ AOSP_VNDR) mkbootimg --vendor_ramdisk "$ramdisk" "${dtb[@]}" --vendor_cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset $tagsoff --dtb_offset $dtboff --os_version "$osver" --os_patch_level "$oslvl" --header_version $hdrver --vendor_boot $outname;;
+ AOSP) mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" "${dtb[@]}" "${recoverydtbo[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --dtb_offset "$dtboff" --os_version "$osver" --os_patch_level "$oslvl" --header_version "$hdrver" $hashtype "${dt[@]}" -o $outname;;
+ AOSP-PXA) pxa-mkbootimg --kernel "$kernel" --ramdisk "$ramdisk" "${second[@]}" --cmdline "$cmdline" --board "$board" --base $base --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --second_offset "$secondoff" --tags_offset "$tagsoff" --unknown $unknown "${dt[@]}" -o $outname;;
+ ELF) elftool pack -o $outname header="$header" "$kernel" "$ramdisk",ramdisk "${rpm[@]}" "${cmd[@]}" >/dev/null;;
+ KRNL) rkcrc -k "$ramdisk" $outname;;
OSIP)
mkdir split_img/.temp 2>/dev/null;
for i in bootstub cmdline.txt hdr kernel parameter sig; do
cp -f split_img/*-*$(basename $i .txt | sed -e 's/hdr/header/') split_img/.temp/$i 2>/dev/null;
done;
cp -f "$ramdisk" split_img/.temp/ramdisk.cpio.gz;
- "$bin/$arch/mboot" -d split_img/.temp -f $outname;
+ mboot -d split_img/.temp -f $outname;
;;
U-Boot)
part0="$kernel";
@@ -312,7 +310,7 @@ case $imgtype in
Multi) part1=(:"$ramdisk");;
RAMDisk) part0="$ramdisk";;
esac;
- "$bin/$arch/mkimage" -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null;
+ mkimage -A $uarch -O $os -T $type -C $comp -a $addr -e $ep -n "$name" -d "$part0""${part1[@]}" $outname >/dev/null;
;;
*) echo " "; echo "Unsupported format."; abort; exit 1;;
esac;
@@ -341,13 +339,13 @@ if [ -f split_img/*-sigtype ]; then
AVBv2) echo "AVBv2 detected, no need to sign.";;
BLOB)
awk 'BEGIN { printf "-SIGNED-BY-SIGNBLOB-\00\00\00\00\00\00\00\00" }' > image-new.img;
- "$bin/$arch/blobpack" blob.tmp $blobtype unsigned-new.img >/dev/null;
+ blobpack blob.tmp $blobtype unsigned-new.img >/dev/null;
cat blob.tmp >> image-new.img;
rm -f blob.tmp;
;;
- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;;
+ CHROMEOS) futility vbutil_kernel --pack image-new.img --keyblock "$bin/chromeos/kernel.keyblock" --signprivate "$bin/chromeos/kernel_data_key.vbprivk" --version 1 --vmlinuz unsigned-new.img --bootloader "$bin/chromeos/empty" --config "$bin/chromeos/empty" --arch arm --flags 0x1;;
DHTB)
- "$bin/$arch/dhtbsign" -i unsigned-new.img -o image-new.img >/dev/null;
+ dhtbsign -i unsigned-new.img -o image-new.img >/dev/null;
rm -f split_img/*-tailtype 2>/dev/null;
;;
NOOK*) cat split_img/*-master_boot.key unsigned-new.img > image-new.img;;
@@ -366,7 +364,7 @@ if [ -f split_img/*-lokitype ]; then
echo " ";
mv -f image-new.img unlokied-new.img;
if [ -f aboot.img ]; then
- "$bin/$arch/loki_tool" patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null;
+ loki_tool patch $lokitype aboot.img unlokied-new.img image-new.img >/dev/null;
if [ ! $? -eq "0" ]; then
echo "Patching failed.";
abort;
diff --git a/unpackimg.sh b/unpackimg.sh
index 9b74f3d..a81eaf0 100755
--- a/unpackimg.sh
+++ b/unpackimg.sh
@@ -53,8 +53,6 @@ esac;
if [ ! "$local" ]; then
cd "$aik";
fi;
-chmod -R 755 "$bin" "$aik"/*.sh;
-chmod 644 "$bin/magic" "$bin/androidbootimg.magic" "$bin/androidsign.magic" "$bin/boot_signer.jar" "$bin/avb/"* "$bin/chromeos/"*;
img="$1";
[ -f "$cur/$1" ] && img="$cur/$1";
@@ -109,10 +107,10 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
case $sigtype in
BLOB)
cp -f "$img" "$file";
- "$bin/$arch/blobunpack" "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null;
+ blobunpack "$file" | tail -n+5 | cut -d" " -f2 | dd bs=1 count=3 > "$file-blobtype" 2>/dev/null;
mv -f "$file."* "$file";
;;
- CHROMEOS) "$bin/$arch/futility" vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";;
+ CHROMEOS) futility vbutil_kernel --get-vmlinuz "$img" --vmlinuz-out "$file";;
DHTB) dd bs=4096 skip=512 iflag=skip_bytes conv=notrunc if="$img" of="$file" 2>/dev/null;;
NOOK)
dd bs=1048576 count=1 conv=notrunc if="$img" of="$file-master_boot.key" 2>/dev/null;
@@ -123,7 +121,7 @@ if [ "$(echo $imgtest | awk '{ print $2 }' | cut -d, -f1)" = "signing" ]; then
dd bs=262144 skip=1 conv=notrunc if="$img" of="$file" 2>/dev/null;
;;
SIN*)
- "$bin/$arch/sony_dump" . "$img" >/dev/null;
+ sony_dump . "$img" >/dev/null;
mv -f "$file."* "$file";
rm -f "$file-sigtype";
;;
@@ -165,7 +163,7 @@ case $(echo $imgtest | awk '{ print $3 }') in
echo " ";
echo "Warning: A dump of your device's aboot.img is required to re-Loki!";
echo " ";
- "$bin/$arch/loki_tool" unlok "$img" "$file" >/dev/null;
+ loki_tool unlok "$img" "$file" >/dev/null;
img="$file";
;;
AMONET)
@@ -220,26 +218,26 @@ case $imgtype in
AOSP_VNDR) vendor=vendor_;;
esac;
case $imgtype in
- AOSP|AOSP_VNDR) "$bin/$arch/unpackbootimg" -i "$img";;
- AOSP-PXA) "$bin/$arch/pxa-unpackbootimg" -i "$img";;
+ AOSP|AOSP_VNDR) unpackbootimg -i "$img";;
+ AOSP-PXA) pxa-unpackbootimg -i "$img";;
ELF)
mkdir elftool_out;
- "$bin/$arch/elftool" unpack -i "$img" -o elftool_out >/dev/null;
+ elftool unpack -i "$img" -o elftool_out >/dev/null;
mv -f elftool_out/header "$file-header" 2>/dev/null;
rm -rf elftool_out;
- "$bin/$arch/unpackelf" -i "$img";
+ unpackelf -i "$img";
;;
KRNL) dd bs=4096 skip=8 iflag=skip_bytes conv=notrunc if="$img" of="$file-ramdisk" 2>&1 | tail -n+3 | cut -d" " -f1-2;;
OSIP)
- "$bin/$arch/mboot" -u -f "$img";
+ mboot -u -f "$img";
[ ! $? -eq "0" ] && error=1;
for i in bootstub cmdline.txt hdr kernel parameter ramdisk.cpio.gz sig; do
mv -f $i "$file-$(basename $i .txt | sed -e 's/hdr/header/' -e 's/ramdisk.cpio.gz/ramdisk/')" 2>/dev/null || true;
done;
;;
U-Boot)
- "$bin/$arch/dumpimage" -l "$img";
- "$bin/$arch/dumpimage" -l "$img" > "$file-header";
+ dumpimage -l "$img";
+ dumpimage -l "$img" > "$file-header";
grep "Name:" "$file-header" | cut -c15- > "$file-name";
grep "Type:" "$file-header" | cut -c15- | cut -d" " -f1 > "$file-arch";
grep "Type:" "$file-header" | cut -c15- | cut -d" " -f2 > "$file-os";
@@ -248,10 +246,10 @@ case $imgtype in
grep "Address:" "$file-header" | cut -c15- > "$file-addr";
grep "Point:" "$file-header" | cut -c15- > "$file-ep";
rm -f "$file-header";
- "$bin/$arch/dumpimage" -p 0 -o "$file-kernel" "$img";
+ dumpimage -p 0 -o "$file-kernel" "$img";
[ ! $? -eq "0" ] && error=1;
case $(cat "$file-type") in
- Multi) "$bin/$arch/dumpimage" -p 1 -o "$file-ramdisk" "$img";;
+ Multi) dumpimage -p 1 -o "$file-ramdisk" "$img";;
RAMDisk) mv -f "$file-kernel" "$file-ramdisk";;
*) touch "$file-ramdisk";;
esac;
@@ -318,8 +316,8 @@ case $ramdiskcomp in
xz) ;;
lzma) ;;
bzip2) compext=bz2;;
- lz4) unpackcmd="$bin/$arch/lz4 -dcq";;
- lz4-l) unpackcmd="$bin/$arch/lz4 -dcq"; compext=lz4;;
+ lz4) unpackcmd="lz4 -dcq";;
+ lz4-l) unpackcmd="lz4 -dcq"; compext=lz4;;
cpio) unpackcmd="cat"; compext="";;
empty) compext=empty;;
*) compext="";;
--
2.52.0
pkgs/by-name/an/android-image-kitchen/0002-Do-not-change-directory.patch
+85
View File
@@ -0,0 +1,85 @@
From 6328bc3ddd491f0589e943deeabdfa4dda40f4c7 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 12 Feb 2026 18:11:37 +0100
Subject: [PATCH 2/2] Do not change directory
Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
cleanup.sh | 4 ++--
repackimg.sh | 4 ++--
unpackimg.sh | 8 ++------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cleanup.sh b/cleanup.sh
index b262c73..d7a3188 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -3,7 +3,7 @@
# osm0sis @ xda-developers
case $1 in
- --help) echo "usage: cleanup.sh [--local] [--quiet]"; exit 1;
+ --help) echo "usage: cleanup.sh [--quiet]"; exit 1;
esac;
case $(uname -s) in
@@ -20,7 +20,7 @@ bin="$aik/bin";
case $1 in
--local) shift;;
- *) cd "$aik";;
+ *) ;;
esac;
if [ -d ramdisk ] && [ "$(stat $statarg ramdisk | head -n 1)" = "root" -o ! "$(find ramdisk 2>&1 | cpio -o >/dev/null 2>&1; echo $?)" -eq "0" ]; then
diff --git a/repackimg.sh b/repackimg.sh
index d5e7bc4..15374c4 100755
--- a/repackimg.sh
+++ b/repackimg.sh
@@ -5,7 +5,7 @@
abort() { echo "Error!"; }
case $1 in
- --help) echo "usage: repackimg.sh [--local] [--original] [--origsize] [--level <0-9>] [--avbkey <name>] [--forceelf]"; exit 1;
+ --help) echo "usage: repackimg.sh [--original] [--origsize] [--level <0-9>] [--avbkey <name>] [--forceelf]"; exit 1;
esac;
case $(uname -s) in
@@ -47,7 +47,7 @@ esac;
case $1 in
--local) shift;;
- *) cd "$aik";;
+ *) ;;
esac;
if [ -z "$(ls split_img/* 2>/dev/null)" -o ! -e ramdisk ]; then
diff --git a/unpackimg.sh b/unpackimg.sh
index a81eaf0..e330766 100755
--- a/unpackimg.sh
+++ b/unpackimg.sh
@@ -6,8 +6,8 @@ cleanup() { "$aik/cleanup.sh" $local --quiet; }
abort() { echo "Error!"; }
case $1 in
- --help) echo "usage: unpackimg.sh [--local] [--nosudo] <file>"; exit 1;;
- --local) local="--local"; shift;;
+ --help) echo "usage: unpackimg.sh [--nosudo] <file>"; exit 1;;
+ --local) shift;;
esac;
case $1 in
--nosudo) nosudo=1; shift;;
@@ -50,10 +50,6 @@ case $plat in
;;
esac;
-if [ ! "$local" ]; then
- cd "$aik";
-fi;
-
img="$1";
[ -f "$cur/$1" ] && img="$cur/$1";
if [ ! "$img" ]; then
--
2.52.0
pkgs/by-name/an/android-image-kitchen/package.nix
+93
View File
@@ -0,0 +1,93 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
blobtools,
dhtbsign,
elftool,
futility,
loki-tool,
lz4,
mboot,
mkbootimg-osm0sis,
mkmtkhdr,
pxa-mkbootimg,
rkflashtool,
sony-dump,
ubootTools,
unpackelf,
}:
stdenv.mkDerivation {
pname = "android-image-kitchen";
version = "0-unstable-2025-10-17";
src = fetchFromGitHub {
owner = "SebaUbuntu";
repo = "AIK-Linux-mirror";
rev = "1c1411bd685bbc5fb4112484af2ad07cb6807f30";
hash = "sha256-auwAXWzUAFS8USTTH9h5nPzmoGOZf53GkLA+KNGl8uc=";
};
patches = [
./0001-Use-PATH-to-find-programs.patch
./0002-Do-not-change-directory.patch
];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace {cleanup,repackimg,unpackimg}.sh \
--replace-fail "bin=\"\$aik/bin\";" "bin=$out/share"
'';
installPhase = ''
runHook preInstall
for i in cleanup repackimg unpackimg; do
install -Dm 555 "$i.sh" "$out/bin/aik-$i"
done
# Remove prebuilt binaries
rm -rf bin/{linux,macos}
# Copy rest of the required files
mkdir -p $out/share
cp -rT bin $out/share
runHook postInstall
'';
postInstall = ''
for i in $out/bin/aik-{cleanup,repackimg,unpackimg}; do
wrapProgram $i --prefix PATH : ${
lib.makeBinPath [
blobtools
dhtbsign
elftool
futility
loki-tool
lz4
mboot
mkbootimg-osm0sis
mkmtkhdr
pxa-mkbootimg
rkflashtool
sony-dump
ubootTools
unpackelf
]
}
done
'';
meta = {
description = "Unpack & repack Android boot files";
homepage = "https://github.com/SebaUbuntu/AIK-Linux-mirror";
# No license specified in the repository
license = lib.licenses.free;
maintainers = with lib.maintainers; [ ungeskriptet ];
teams = [ lib.teams.android ];
mainProgram = "aik-unpackimg";
};
}
pkgs/by-name/ap/apidog/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
let
pname = "apidog";
version = "2.8.12";
version = "2.8.23";
src = fetchurl {
url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
hash = "sha256-bCh3GW+K++3eI3SdcD5t7Vk1jYPl4KFWr1dwqXL7fOQ=";
hash = "sha256-N3ULCrYJilcc3R102ndXjKH3g/km7WcEMdi+NL8nmqA=";
};
appimageContents = appimageTools.extract {
pkgs/by-name/ar/argocd/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "argocd";
version = "3.3.5";
version = "3.3.6";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
tag = "v${finalAttrs.version}";
hash = "sha256-sih7HrF9qwSI7j8A76iZl54CcO5aI09dt65YdupZ08c=";
hash = "sha256-84GlX9m1+Af9EPPdvLJcZIqhw7a1DBj1xKmUpNnngbk=";
};
ui = stdenv.mkDerivation {
pkgs/by-name/ar/art-standalone/package.nix
+1 -13
View File
@@ -65,19 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng
lz4
openssl
(wolfssl.overrideAttrs (oldAttrs: {
configureFlags = oldAttrs.configureFlags ++ [
"--enable-jni"
];
# Disable failing tests when jni enabled
postPatch = oldAttrs.postPatch or "" + ''
sed -i '/TEST_DECL(test_wolfSSL_Tls13_ECH)/d;
/TEST_DECL(test_wolfSSL_Tls13_ECH_HRR)/d;
/TEST_DECL(test_TLSX_CA_NAMES_bad_extension)/d' tests/api.c
sed -i '/quic/d' tests/include.am
sed -i '300,305d' tests/unit.c
'';
}))
(wolfssl.override { enableJni = true; })
xz
zlib
];
pkgs/by-name/as/assh/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "assh";
version = "2.17.0";
version = "2.17.1";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
owner = "moul";
tag = "v${finalAttrs.version}";
hash = "sha256-X5UWQe4c+QudmXKjFKafivO/OvdBNzyutrL+CUK0olg=";
hash = "sha256-rHe0ynjj/7LXUKoS4iO+PJjh4SVBqh+kChuYzSFocfs=";
};
vendorHash = "sha256-EA39KqAN9SHPU362j6/j6okvT+eZb2R4unMA0bB+bVg=";
pkgs/by-name/as/ast-grep/package.nix
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ast-grep";
version = "0.41.1";
version = "0.42.1";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
tag = finalAttrs.version;
hash = "sha256-AijxixgT8X/c1UtMD6l4BFvYGj3Up0C1CtfwCRdxSfw=";
hash = "sha256-TdVjoJmWZ76e9h+/z4/TlytJgwQpQu/esRuZg1sZw8A=";
};
# error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm .cargo/config.toml
'';
cargoHash = "sha256-OIf59YUuu8ohpGXRdeiPaM/xdH4ZaQYoCuBG/NNhZcc=";
cargoHash = "sha256-EokHEduK+8h+JzIKRRga+QXLkfC4CK+qyoIxMwD2OPI=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/au/audiosource/adb-args-fix.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/audiosource b/audiosource
index e2f034c..b6efc34 100755
--- a/audiosource
+++ b/audiosource
@@ -82,9 +82,9 @@ install() {
echo '[+] Installing Audio Source'
- adb install -rtg "$AUDIOSOURCE_APK" || {
+ adb install -r -t -g "$AUDIOSOURCE_APK" || {
adb uninstall "$AUDIOSOURCE_PKG"
- adb install -tg "$AUDIOSOURCE_APK"
+ adb install -t -g "$AUDIOSOURCE_APK"
}
}
pkgs/by-name/au/audiosource/package.nix
+7 -5
View File
@@ -13,18 +13,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "audiosource";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "gdzx";
repo = "audiosource";
tag = "v${finalAttrs.version}";
hash = "sha256-SlX8gjs7X5jfoeU6pyk4n8f6oMJgneGVt0pmFs48+mQ=";
hash = "sha256-npN7V1svKaxCfsZBvmfm7T/UJsAQ4hQM3RN+tpK5cms=";
};
patches = [
# Removes build-related logic from the script that is unused in the package and fixes a small bug with adb args on new Android versions
./unused-logic-removal-and-args-fix.patch
# Removes build-related logic from the script that is unused in the package
./unused-logic-removal.patch
# Fixes a small bug with adb args on new Android versions
./adb-args-fix.patch
];
postPatch = ''
@@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.apk = fetchurl {
url = "https://github.com/gdzx/audiosource/releases/download/v${finalAttrs.version}/audiosource.apk";
hash = "sha256-vDIF+NZ3JgTT67Dem4qeajWsA5m/MFt2nRDpWUqC9aU=";
hash = "sha256:cd48532829f41060d3c9909daa5563a669394eb9dd00baf303b6db1b5b2db1fa";
};
meta = {
pkgs/by-name/au/audiosource/unused-logic-removal-and-args-fix.patch → pkgs/by-name/au/audiosource/unused-logic-removal.patch
+25 -18
View File
@@ -1,5 +1,5 @@
diff --git a/audiosource b/audiosource
index b06127a..0bccddf 100755
index e2f034c..787076e 100755
--- a/audiosource
+++ b/audiosource
@@ -2,15 +2,7 @@
@@ -16,18 +16,25 @@ index b06127a..0bccddf 100755
-
-AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"$AUDIOSOURCE_DEFAULT_APK"}
+AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"@apkPath@"}
AUDIOSOURCE_PKG='fr.dzx.audiosource'
ANDROID_SERIAL=${ANDROID_SERIAL:-}
PYSOCAT="$(cat <<EOF
@@ -81,22 +73,12 @@ install() {
@@ -57,14 +49,6 @@ if __name__ == '__main__':
EOF
)"
echo '[+] Installing Audio Source'
- adb install -rtg "$AUDIOSOURCE_APK" || {
+ adb install -r -t -g "$AUDIOSOURCE_APK" || {
adb uninstall fr.dzx.audiosource
- adb install -tg "$AUDIOSOURCE_APK"
+ adb install -t -g "$AUDIOSOURCE_APK"
-build() {
- if [ "$AUDIOSOURCE_PROFILE" = 'release' ]; then
- ./gradlew assembleRelease
- else
- ./gradlew assembleDebug
- fi
-}
-
install() {
if ! command -v adb &> /dev/null; then
echo "Error: adb not found"
@@ -88,16 +72,6 @@ install() {
}
}
@@ -44,7 +51,7 @@ index b06127a..0bccddf 100755
_unload() {
for id in `pactl list modules short | sed -n "/module-pipe-source\tsource_name=$AUDIOSOURCE_NAME/p" | cut -f1`; do
pactl unload-module "$id"
@@ -146,7 +128,7 @@ volume() {
@@ -189,7 +163,7 @@ volume() {
main_help() {
cat <<-EOF
@@ -53,15 +60,15 @@ index b06127a..0bccddf 100755
Options:
@@ -154,15 +136,13 @@ main_help() {
@@ -197,7 +171,6 @@ main_help() {
Commands:
- build Build Audio Source APK (default: debug)
- install Install Audio Source to Android device (default: debug)
+ install Install Audio Source to Android device
run Run Audio Source and start forwarding
volume LEVEL Set volume to LEVEL (for example, 250%)
- build Build Audio Source APK
install Install Audio Source to Android device
run [-r] Run Audio Source and start forwarding
(-r will automatically restart)
@@ -205,8 +178,7 @@ main_help() {
Environment:
@@ -71,7 +78,7 @@ index b06127a..0bccddf 100755
AUDIOSOURCE_NAME Name of the PulseAudio source (default: android-<serial-hash>)
ANDROID_SERIAL Device serial number to connect to (default: unset)
EOF
@@ -200,7 +180,7 @@ main() {
@@ -244,7 +216,7 @@ main() {
shift
case "$cmd" in
pkgs/by-name/av/aviator/bump-golang-x-sys.patch
-24
View File
@@ -1,24 +0,0 @@
diff --git a/go.mod b/go.mod
index 9bc55db..4bddb07 100644
--- a/go.mod
+++ b/go.mod
@@ -19,5 +19,6 @@ require (
github.com/smallfish/simpleyaml v0.0.0-20170527020626-116d8e577389 // indirect
github.com/starkandwayne/goutils v0.0.0-20190115202530-896b8a6904be
github.com/urfave/cli v1.19.1
+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
gopkg.in/yaml.v2 v2.3.0
)
diff --git a/go.sum b/go.sum
index 7641199..d983a95 100644
--- a/go.sum
+++ b/go.sum
@@ -138,6 +138,8 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
pkgs/by-name/av/aviator/fix-except-type.patch
+24
View File
@@ -0,0 +1,24 @@
--- /nix/store/vi2p09s1xk39c6r8p8r0rm0p5c7nka62-source/processor/processor_test.go 1970-01-01 08:00:01
+++ source-orig/processor/processor_test.go 2026-03-27 11:41:40
@@ -496,7 +496,7 @@
cfg.Merge[0].With.Files = []string{"fake1", "fake2"}
cfg.ForEach.In = "integration/yamls/addons/"
cfg.ForEach.SubDirs = true
- cfg.ForEach.Except = "fake2"
+ cfg.ForEach.Except = []string{"fake2"}
cfg.ForEach.ForAll = "integration/yamls/"
spruceConfig = []aviator.Spruce{cfg}
@@ -507,10 +507,10 @@
Expect(err).ToNot(HaveOccurred())
cc := spruceClient.MergeWithOptsCallCount()
- Expect(cc).To(Equal(8))
+ Expect(cc).To(Equal(9))
mergeOpts := spruceClient.MergeWithOptsArgsForCall(0)
- Expect(len(mergeOpts.Files)).To(Equal(4))
+ Expect(len(mergeOpts.Files)).To(Equal(5))
})
})
})
pkgs/by-name/av/aviator/package.nix
+17 -5
View File
@@ -2,31 +2,43 @@
lib,
buildGoModule,
fetchFromGitHub,
testers,
}:
buildGoModule (finalAttrs: {
pname = "aviator";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "herrjulz";
repo = "aviator";
rev = "v${finalAttrs.version}";
sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ=";
hash = "sha256-jqAGwPqxxCkBpSMebikdUGh54hlSLeqAyf7BOBtjiNA=";
};
patches = [
./bump-golang-x-sys.patch
# Fix test failures caused by type mismatch in ForEach.Except field
# The Except field was changed from string to []string
./fix-except-type.patch
];
deleteVendor = true;
vendorHash = "sha256-AJyxCE4DdAXRS+2sY4Zzu8NTEFKJoV1bopfOqOFKZfI=";
vendorHash = "sha256-rYOphvI1ZE8X5UExfgxHnWBn697SDkNnmxeY7ihIZ1s=";
ldflags = [
"-s"
"-w"
];
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
meta = {
description = "Merge YAML/JSON files in a in a convenient fashion";
mainProgram = "aviator";
homepage = "https://github.com/herrjulz/aviator";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ risson ];
mainProgram = "aviator";
};
})
pkgs/by-name/ba/bazel_9/bazel-execlog.sh
+3
View File
@@ -0,0 +1,3 @@
#!@runtimeShell@
exec @binJava@ -jar @out@/share/parser_deploy.jar "$@"
pkgs/by-name/ba/bazel_9/build-support/bazelDerivation.nix
+77
View File
@@ -0,0 +1,77 @@
{
stdenv,
lndir,
lib,
}:
args@{
bazel,
registry ? null,
bazelRepoCache ? null,
bazelVendorDeps ? null,
startupArgs ? [ ],
commandArgs ? [ ],
bazelPreBuild ? "",
bazelPostBuild ? "",
serverJavabase ? null,
targets,
command,
...
}:
stdenv.mkDerivation (
{
preBuildPhases = [ "preBuildPhase" ];
preBuildPhase =
(lib.optionalString (bazelRepoCache != null) ''
# repo_cache needs to be writeable even in air-gapped builds
mkdir repo_cache
${lndir}/bin/lndir -silent ${bazelRepoCache}/repo_cache repo_cache
'')
+ (lib.optionalString (bazelVendorDeps != null) ''
mkdir vendor_dir
${lndir}/bin/lndir -silent ${bazelVendorDeps}/vendor_dir vendor_dir
# pin all deps to avoid re-fetch attempts by Bazel
rm vendor_dir/VENDOR.bazel
find vendor_dir -mindepth 1 -maxdepth 1 -type d -printf "pin(\"@@%P\")\n" > vendor_dir/VENDOR.bazel
'')
# keep preBuildPhase always defined as it is listed in preBuildPhases
+ ''
true
'';
buildPhase = ''
runHook preBuild
export HOME=$(mktemp -d)
${bazelPreBuild}
${bazel}/bin/bazel ${
lib.escapeShellArgs (
lib.optional (serverJavabase != null) "--server_javabase=${serverJavabase}"
++ [ "--batch" ]
++ startupArgs
)
} ${command} ${
lib.escapeShellArgs (
lib.optional (registry != null) "--registry=file://${registry}"
++ lib.optionals (bazelRepoCache != null) [
"--repository_cache=repo_cache"
"--repo_contents_cache="
]
++ lib.optional (bazelVendorDeps != null) "--vendor_dir=vendor_dir"
++ commandArgs
++ targets
)
}
${bazelPostBuild}
runHook postBuild
'';
}
// args
)
pkgs/by-name/ba/bazel_9/build-support/bazelPackage.nix
+172
View File
@@ -0,0 +1,172 @@
{
callPackage,
gnugrep,
lib,
autoPatchelfHook,
stdenv,
}:
{
name,
src,
sourceRoot ? null,
version ? null,
targets,
bazel,
startupArgs ? [ ],
commandArgs ? [ ],
env ? { },
serverJavabase ? null,
registry ? null,
bazelRepoCacheFOD ? {
outputHash = null;
outputHashAlgo = "sha256";
},
bazelVendorDepsFOD ? {
outputHash = null;
outputHashAlgo = "sha256";
},
installPhase,
buildInputs ? [ ],
nativeBuildInputs ? [ ],
autoPatchelfIgnoreMissingDeps ? null,
patches ? [ ],
}:
let
# FOD produced by `bazel fetch`
# Repo cache contains content-addressed external Bazel dependencies without any patching
# Potentially this can be nixified via --experimental_repository_resolved_file
# (Note: file itself isn't reproducible because it has lots of extra info and order
# isn't stable too. Parsing it into nix fetch* commands isn't trivial but might be possible)
bazelRepoCache =
if bazelRepoCacheFOD.outputHash == null then
null
else
(callPackage ./bazelDerivation.nix { } {
name = "bazelRepoCache";
inherit (bazelRepoCacheFOD) outputHash outputHashAlgo;
inherit
src
version
sourceRoot
env
buildInputs
nativeBuildInputs
patches
;
inherit registry;
inherit
bazel
targets
startupArgs
serverJavabase
;
command = "fetch";
outputHashMode = "recursive";
commandArgs = [
"--repository_cache=repo_cache"
"--repo_contents_cache="
]
++ commandArgs;
bazelPreBuild = ''
mkdir repo_cache
'';
installPhase = ''
mkdir -p $out/repo_cache
cp -r --reflink=auto repo_cache/* $out/repo_cache
'';
});
# Stage1: FOD produced by `bazel vendor`, Stage2: eventual patchelf or other tuning
# Vendor deps contains unpacked&patches external dependencies, this may need Nix-specific
# patching to address things like
# - broken symlinks
# - symlinks or other references to absolute nix store paths which isn't allowed for FOD
# - autoPatchelf for externally-fetched binaries
#
# Either repo cache or vendor deps should be enough to build a given package
bazelVendorDeps =
if bazelVendorDepsFOD.outputHash == null then
null
else
(
let
stage1 = callPackage ./bazelDerivation.nix { } {
name = "bazelVendorDepsStage1";
inherit (bazelVendorDepsFOD) outputHash outputHashAlgo;
inherit
src
version
sourceRoot
env
buildInputs
nativeBuildInputs
patches
;
inherit registry;
inherit
bazel
targets
startupArgs
serverJavabase
;
dontFixup = true;
command = "vendor";
outputHashMode = "recursive";
commandArgs = [ "--vendor_dir=vendor_dir" ] ++ commandArgs;
bazelPreBuild = ''
mkdir vendor_dir
'';
bazelPostBuild = ''
# remove symlinks that point to locations under bazel_src/
find vendor_dir -type l -lname "$HOME/*" -exec rm '{}' \;
# remove symlinks to temp build directory on darwin
find vendor_dir -type l -lname "/private/var/tmp/*" -exec rm '{}' \;
# remove broken symlinks
find vendor_dir -xtype l -exec rm '{}' \;
# remove .marker files referencing NIX_STORE as those references aren't allowed in FOD
(${gnugrep}/bin/grep -rI "$NIX_STORE/" vendor_dir --files-with-matches --include="*.marker" --null || true) \
| xargs -0 --no-run-if-empty rm
'';
installPhase = ''
mkdir -p $out/vendor_dir
cp -r --reflink=auto vendor_dir/* $out/vendor_dir
'';
};
in
stdenv.mkDerivation {
name = "bazelVendorDeps";
buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook ++ buildInputs;
inherit autoPatchelfIgnoreMissingDeps;
src = stage1;
installPhase = ''
cp -r . $out
'';
}
);
package = callPackage ./bazelDerivation.nix { } {
inherit
name
src
version
sourceRoot
env
buildInputs
nativeBuildInputs
patches
;
inherit registry bazelRepoCache bazelVendorDeps;
inherit
bazel
targets
startupArgs
serverJavabase
commandArgs
;
inherit installPhase;
command = "build";
};
in
package // { passthru = { inherit bazelRepoCache bazelVendorDeps; }; }
pkgs/by-name/ba/bazel_9/build-support/patching.nix
+24
View File
@@ -0,0 +1,24 @@
{
stdenv,
}:
{
# If there's a need to patch external dependencies managed by Bazel
# one option is to configure patches on Bazel level. Bazel doesn't
# allow patches to be in absolute paths so this helper will produce
# sources patch that adds given file to given location
addFilePatch =
{
path,
file,
}:
stdenv.mkDerivation {
name = "add_file.patch";
dontUnpack = true;
buildPhase = ''
mkdir -p $(dirname "${path}")
cp ${file} "${path}"
diff -u /dev/null "${path}" >result.patch || true # diff exit code is non-zero if there's a diff
'';
installPhase = "cp result.patch $out";
};
}
pkgs/by-name/ba/bazel_9/defaultShell.nix
+41
View File
@@ -0,0 +1,41 @@
{
lib,
makeBinaryWrapper,
writeShellApplication,
bash,
stdenv,
}:
{ defaultShellUtils }:
let
defaultShellPath = lib.makeBinPath defaultShellUtils;
bashWithDefaultShellUtilsSh = writeShellApplication {
name = "bash";
runtimeInputs = defaultShellUtils;
# Empty PATH in Nixpkgs Bash is translated to /no-such-path
# On other distros empty PATH search fallback is looking in standard
# locations like /bin,/usr/bin
# For Bazel many rules rely on such search finding some common utils,
# so we provide them in case rules or arguments didn't specify a precise PATH
text = ''
if [[ "$PATH" == "/no-such-path" ]]; then
export PATH=${defaultShellPath}
fi
exec ${bash}/bin/bash "$@"
'';
};
in
{
inherit defaultShellUtils defaultShellPath;
# Script-based interpreters in shebangs aren't guaranteed to work,
# especially on MacOS. So let's produce a binary
bashWithDefaultShellUtils = stdenv.mkDerivation {
name = "bash";
src = bashWithDefaultShellUtilsSh;
nativeBuildInputs = [ makeBinaryWrapper ];
buildPhase = ''
makeWrapper ${bashWithDefaultShellUtilsSh}/bin/bash $out/bin/bash
'';
};
}
pkgs/by-name/ba/bazel_9/examples.nix
+151
View File
@@ -0,0 +1,151 @@
{
fetchFromGitHub,
lib,
bazel_9,
libgcc,
cctools,
stdenv,
jdk_headless,
callPackage,
zlib,
libxcrypt-legacy,
}:
let
bazelPackage = callPackage ./build-support/bazelPackage.nix { };
registry = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-central-registry";
rev = "0e9e0cfdb88577300cc369d0cbe81e678d0fb271";
sha256 = "sha256-YAR0tYVUdITfW/2H/LZky88nyoWTsgZf/CX4BtJ/Mwk=";
};
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "examples";
rev = "2a8db5804341036b393ff7e1ba88edb30c8a82c7";
sha256 = "sha256-/+rU73WPIKguoEOJDCodE3pUGSGju0VhixIcr0zBVmY=";
};
inherit (callPackage ./build-support/patching.nix { }) addFilePatch;
in
{
java = bazelPackage {
inherit src registry;
sourceRoot = "source/java-tutorial";
name = "java-tutorial";
targets = [ "//:ProjectRunner" ];
bazel = bazel_9;
commandArgs = [
"--extra_toolchains=@@rules_java++toolchains+local_jdk//:all"
"--tool_java_runtime_version=local_jdk_21"
]
++ lib.optional stdenv.hostPlatform.isDarwin "--spawn_strategy=local";
env = {
JAVA_HOME = jdk_headless.home;
USE_BAZEL_VERSION = bazel_9.version;
};
installPhase = ''
mkdir $out
cp bazel-bin/ProjectRunner.jar $out/
'';
buildInputs = [
libgcc
libxcrypt-legacy
stdenv.cc.cc.lib
];
nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools;
patches = [
./patches/examples/java-tutorial.patch
(addFilePatch {
path = "b/rules_cc.patch";
file = ./patches/examples/rules_cc.patch;
})
];
bazelVendorDepsFOD = {
outputHash =
{
aarch64-darwin = "sha256-MRm+Pm5mDXys8erQLKHRSClFzxWIYU7Y/otKxl5sJQg=";
aarch64-linux = "sha256-cJuNZapJ8LvfPRdv5V9iuy0xxCxLFI5uWTLtAa6bE/w=";
x86_64-darwin = "sha256-fOLRQIiRq7BATULy7W90bQ/DrW3Fn7vLut6fKFSoQDA=";
x86_64-linux = "sha256-nSe0ywhsTJz6ycqTZaUKfnOvpJOmwip8hYXck9HtW2Q=";
}
.${stdenv.hostPlatform.system};
outputHashAlgo = "sha256";
};
};
cpp = bazelPackage {
inherit src registry;
sourceRoot = "source/cpp-tutorial/stage3";
name = "cpp-tutorial";
targets = [ "//main:hello-world" ];
bazel = bazel_9;
installPhase = ''
mkdir $out
cp bazel-bin/main/hello-world $out/
'';
nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools;
commandArgs = lib.optionals (stdenv.hostPlatform.isDarwin) [
"--host_cxxopt=-xc++"
"--cxxopt=-xc++"
"--spawn_strategy=local"
];
env = {
USE_BAZEL_VERSION = bazel_9.version;
};
patches = [
./patches/examples/cpp-tutorial.patch
(addFilePatch {
path = "b/rules_cc.patch";
file = ./patches/examples/rules_cc.patch;
})
];
bazelRepoCacheFOD = {
outputHash =
{
aarch64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
aarch64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
x86_64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
x86_64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
}
.${stdenv.hostPlatform.system};
outputHashAlgo = "sha256";
};
};
rust = bazelPackage {
inherit src registry;
sourceRoot = "source/rust-examples/01-hello-world";
name = "rust-examples-01-hello-world";
targets = [ "//:bin" ];
bazel = bazel_9;
env = {
USE_BAZEL_VERSION = bazel_9.version;
};
installPhase = ''
mkdir $out
cp bazel-bin/bin $out/hello-world
'';
buildInputs = [
zlib
libgcc
];
nativeBuildInputs = lib.optional (stdenv.hostPlatform.isDarwin) cctools;
commandArgs = lib.optional stdenv.hostPlatform.isDarwin "--spawn_strategy=local";
autoPatchelfIgnoreMissingDeps = [ "librustc_driver-*.so" ];
patches = [
./patches/examples/rust-examples.patch
(addFilePatch {
path = "b/rules_cc.patch";
file = ./patches/examples/rules_cc.patch;
})
];
bazelVendorDepsFOD = {
outputHash =
{
aarch64-darwin = "sha256-6rUV8UMjFZXA053BXIruK8+OEturmtz+YeAlkivePdA=";
aarch64-linux = "sha256-/mv7HVsx97RLzYl12WwsI2gYf0qBr+78B5NiEpTRyrc=";
x86_64-darwin = "sha256-BpQFhalV5AfYSjWQp+9lxOnfbaD/NADtvrNMqznEojM=";
x86_64-linux = "sha256-uutDUAHYecqDYmS90jZfZ8IrhSzpWB6WgcsZPlRJVaM=";
}
.${stdenv.hostPlatform.system};
outputHashAlgo = "sha256";
};
};
}
pkgs/by-name/ba/bazel_9/package.nix
+343
View File
@@ -0,0 +1,343 @@
{
stdenv,
callPackage,
# nix tooling and utilities
darwin,
lib,
fetchzip,
makeWrapper,
replaceVars,
# native build inputs
runtimeShell,
zip,
unzip,
bash,
coreutils,
which,
gawk,
gnused,
gnutar,
gnugrep,
gzip,
findutils,
diffutils,
gnupatch,
file,
installShellFiles,
python3,
# Apple dependencies
cctools,
# Allow to independently override the jdks used to build and run respectively
jdk_headless,
version ? "9.0.1",
}:
let
inherit (callPackage ./build-support/patching.nix { }) addFilePatch;
inherit (stdenv.hostPlatform) isDarwin isAarch64;
defaultShellUtils =
# Keep this list conservative. For more exotic tools, prefer to use
# @rules_nixpkgs to pull in tools from the nix repository. Example:
#
# WORKSPACE:
#
# nixpkgs_git_repository(
# name = "nixpkgs",
# revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
# )
#
# # This defines an external Bazel workspace.
# nixpkgs_package(
# name = "bison",
# repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
# )
#
# some/BUILD.bazel:
#
# genrule(
# ...
# cmd = "$(location @bison//:bin/bison) -other -args",
# tools = [
# ...
# "@bison//:bin/bison",
# ],
# )
[
bash # see https://github.com/NixOS/nixpkgs/pull/489519
coreutils
diffutils
file
findutils
gawk
gnugrep
gnupatch
gnused
gnutar
gzip
python3 # see https://github.com/NixOS/nixpkgs/pull/489519
unzip
which
zip
];
defaultShell = callPackage ./defaultShell.nix { } { inherit defaultShellUtils; };
bazelSystem = if isDarwin then "darwin" else "linux";
# on aarch64 Darwin, `uname -m` returns "arm64"
bazelArch = if isDarwin && isAarch64 then "arm64" else stdenv.hostPlatform.parsed.cpu.name;
src = fetchzip {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-tdrSgtIXi8Xd03BgxLRWhw1bB1Zhuo0E2pWMCskBDG8=";
stripRoot = false;
};
commandArgs = [
"--nobuild_python_zip"
"--features=-module_maps"
"--host_features=-module_maps"
"--announce_rc"
"--verbose_failures"
"--curses=no"
]
++ lib.optionals isDarwin [
"--macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion}"
"--action_env=NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt}"
];
extraCflags = lib.optionals isDarwin [
"-isystem ${lib.getDev darwin.libresolv}/include"
"-isystem ${lib.getDev stdenv.cc.libcxx}/include/c++/v1"
];
in
stdenv.mkDerivation rec {
pname = "bazel";
inherit version src;
darwinPatches = [
# Bazel integrates with apple IOKit to inhibit and track system sleep.
# Inside the darwin sandbox, these API calls are blocked, and bazel
# crashes. It seems possible to allow these APIs inside the sandbox, but it
# feels simpler to patch bazel not to use it at all. So our bazel is
# incapable of preventing system sleep, which is a small price to pay to
# guarantee that it will always run in any nix context.
#
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
# sandbox.
#
# If you want to investigate the sandbox profile path,
# IORegisterForSystemPower can be allowed with
#
# propagatedSandboxProfile = ''
# (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
# '';
#
# I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
./patches/darwin_sleep.patch
# Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support.
# Nixpkgs toolcahins do not support that (yet?) and get confused.
# Also add an explicit /usr/bin prefix that will be patched below.
(replaceVars ./patches/xcode.patch {
clangDarwin = "${stdenv.cc}/bin/clang";
})
];
patches = lib.optionals isDarwin darwinPatches ++ [
# Revert preference for apple_support over rules_cc toolchain for now
# will need to figure out how to build with apple_support toolchain later
./patches/apple_cc_toolchain.patch
./patches/build_execlog_parser.patch
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
# So we are replacing this bazel paths by defaultShellPath,
# improving hermeticity and making it work in nixos.
(replaceVars ./patches/strict_action_env.patch {
strictActionEnvPatch = defaultShell.defaultShellPath;
})
(replaceVars ./patches/default_bash.patch {
defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash";
})
# Provide default JRE for Bazel process by setting --server_javabase=
# in a new default system bazelrc file
(replaceVars ./patches/bazel_rc.patch {
bazelSystemBazelRCPath = replaceVars ./system.bazelrc {
serverJavabase = jdk_headless;
};
})
# patch that propagates rules_* patches below
# patches need to be within source root and can't be absolute paths in Nix store
# so rules_* patches are injected via addFilePatch
./patches/deps_patches.patch
(addFilePatch {
path = "b/third_party/rules_python.patch";
file = replaceVars ./patches/rules_python.patch {
usrBinEnv = "${coreutils}/bin/env";
};
})
(addFilePatch {
path = "b/third_party/rules_java.patch";
file = replaceVars ./patches/rules_java.patch {
defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash";
};
})
(addFilePatch {
path = "b/third_party/rules_cc.patch";
file = replaceVars ./patches/rules_cc.patch {
defaultBash = "${defaultShell.bashWithDefaultShellUtils}/bin/bash";
};
})
(addFilePatch {
path = "b/third_party/grpc.patch";
file = ./patches/grpc.patch;
})
(replaceVars ./patches/md5sum.patch {
md5sum = "${coreutils}/bin/md5sum";
})
# Nix build sandbox can configure custom PATH but doesn't have
# /usr/bin/env which is unfortunate https://github.com/NixOS/nixpkgs/issues/6227
# and we need to do a silly patch
(replaceVars ./patches/usr_bin_env.patch {
usrBinEnv = "${coreutils}/bin/env";
})
];
meta = {
homepage = "https://github.com/bazelbuild/bazel/";
description = "Build tool that builds code quickly and reliably";
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # source bundles dependencies as jars
];
license = lib.licenses.asl20;
teams = [ lib.teams.bazel ];
mainProgram = "bazel";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
nativeBuildInputs = [
makeWrapper
jdk_headless
python3
unzip
which
# Shell completion
installShellFiles
python3.pkgs.absl-py # Needed to build fish completion
]
# Needed for execlog
++ lib.optional (!stdenv.hostPlatform.isDarwin) stdenv.cc
++ lib.optional (stdenv.hostPlatform.isDarwin) cctools.libtool;
buildPhase = ''
runHook preBuild
export HOME=$(mktemp -d)
# If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
# and `git rev-parse --short HEAD` which would result in
# "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
# Actual bazel releases use scripts/release/common.sh which is based
# on branch/tag information which we don't have with tarball releases.
# Note that .bazelversion is always correct and is based on bazel-*
# executable name, version checks should work fine
export EMBED_LABEL="${version}- (@non-git)"
echo "Stage 1 - Running bazel bootstrap script"
# Note: can't use lib.escapeShellArgs here because it will escape arguments
# with = using single quotes. This is fine for command invocations,
# but for string variable they become literal single quote chars,
# compile.sh will not unquote them either and command will be invalid.
export EXTRA_BAZEL_ARGS="${lib.strings.concatStringsSep " " commandArgs}"
export NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt}="${lib.strings.concatStringsSep " " extraCflags}"
${bash}/bin/bash ./compile.sh
# XXX: get rid of this, or move it to another stage.
# It is plain annoying when builds fail.
echo "Stage 2 - Generate bazel completions"
${bash}/bin/bash ./scripts/generate_bash_completion.sh \
--bazel=./output/bazel \
--output=./output/bazel-complete.bash \
--prepend=./scripts/bazel-complete-header.bash \
--prepend=./scripts/bazel-complete-template.bash
${python3}/bin/python3 ./scripts/generate_fish_completion.py \
--bazel=./output/bazel \
--output=./output/bazel-complete.fish
runHook postBuild
'';
installPhase = ''
runHook preInstall
# Bazel binary contains zip archive, which contains text files and a jar
# both of which can have store references that might be obscured to Nix
# builder in packaged form, so we unpack and extract those references
# Note: grep isn't necessarily 100% accurate, other approaches could be
# to disassemble Jar (slow) or hardcode known references
mkdir -p $out/nix-support
INSTALL_BASE=$(./output/bazel --batch info install_base)
find "$INSTALL_BASE" -type f -exec \
${gnugrep}/bin/grep --text --only-matching --no-filename "$NIX_STORE/[^/]*" '{}' \; \
| sort -u >> $out/nix-support/depends
mkdir -p $out/bin
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel if
# it can’t find something in tools, it calls
# $out/bin/bazel-{version}-{os_arch} The binary _must_ exist with this
# naming if your project contains a .bazelversion file.
cp ./scripts/packages/bazel.sh $out/bin/bazel
versioned_bazel="$out/bin/bazel-${version}-${bazelSystem}-${bazelArch}"
mv ./output/bazel "$versioned_bazel"
wrapProgram "$versioned_bazel" --suffix PATH : ${defaultShell.defaultShellPath}
mkdir $out/share
cp ./output/parser_deploy.jar $out/share/parser_deploy.jar
substitute ${./bazel-execlog.sh} $out/bin/bazel-execlog \
--subst-var out \
--subst-var-by runtimeShell ${runtimeShell} \
--subst-var-by binJava ${jdk_headless}/bin/java
chmod +x $out/bin/bazel-execlog
# shell completion files
installShellCompletion --bash \
--name bazel.bash \
./output/bazel-complete.bash
installShellCompletion --zsh \
--name _bazel \
./scripts/zsh_completion/_bazel
installShellCompletion --fish \
--name bazel.fish \
./output/bazel-complete.fish
'';
postFixup =
# verify that bazel binary still works post-fixup
''
USE_BAZEL_VERSION=${version} $out/bin/bazel --batch info release
'';
# Bazel binary includes zip archive at the end that `strip` would end up discarding
stripExclude = [ "bin/.bazel-${version}-*-wrapped" ];
passthru = {
tests = {
inherit (callPackage ./examples.nix { }) cpp java rust;
};
};
}
pkgs/by-name/ba/bazel_9/patches/apple_cc_toolchain.patch
+18
View File
@@ -0,0 +1,18 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 62c1c29d67..d845a0e98d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -39,10 +39,10 @@ bazel_dep(name = "with_cfg.bzl", version = "0.13.0")
bazel_dep(name = "zlib", version = "1.3.1.bcr.7")
bazel_dep(name = "zstd-jni", version = "1.5.6-9")
-# Depend on apple_support first and then rules_cc so that the Xcode toolchain
-# from apple_support wins over the generic Unix toolchain from rules_cc.
-bazel_dep(name = "apple_support", version = "1.24.5")
+# Depend on apple_support second after rules_cc so that the Xcode toolchain
+# from apple_support does not win over the generic Unix toolchain from rules_cc.
bazel_dep(name = "rules_cc", version = "0.2.17")
+bazel_dep(name = "apple_support", version = "1.24.5")
# The starlark rules in @rules_cc are hidden behind macros but docgen needs to
# load the rule class directly, so we need to expose the cc_compatibility_proxy
pkgs/by-name/ba/bazel_9/patches/bazel_rc.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index 8f8f15685f..a7ae52d1e4 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -56,7 +56,7 @@ OptionProcessor::OptionProcessor(
: workspace_layout_(workspace_layout),
startup_options_(std::move(default_startup_options)),
parse_options_called_(false),
- system_bazelrc_path_(BAZEL_SYSTEM_BAZELRC_PATH) {}
+ system_bazelrc_path_("@bazelSystemBazelRCPath@") {}
OptionProcessor::OptionProcessor(
const WorkspaceLayout* workspace_layout,
pkgs/by-name/ba/bazel_9/patches/build_execlog_parser.patch
+28
View File
@@ -0,0 +1,28 @@
diff --git a/compile.sh b/compile.sh
index 4712355d48..feec286704 100755
--- a/compile.sh
+++ b/compile.sh
@@ -76,6 +76,13 @@ bazel_build "src:bazel_nojdk${EXE_EXT}" \
--host_platform=@platforms//host \
--platforms=@platforms//host \
|| fail "Could not build Bazel"
+
+bazel_build src/tools/execlog:parser_deploy.jar \
+ --action_env=PATH \
+ --host_platform=@platforms//host \
+ --platforms=@platforms//host \
+ || fail "Could not build parser_deploy.jar"
+
bazel_bin_path="$(get_bazel_bin_path)/src/bazel_nojdk${EXE_EXT}"
[ -e "$bazel_bin_path" ] \
|| fail "Could not find freshly built Bazel binary at '$bazel_bin_path'"
@@ -84,5 +91,8 @@ cp -f "$bazel_bin_path" "output/bazel${EXE_EXT}" \
chmod 0755 "output/bazel${EXE_EXT}"
BAZEL="$(pwd)/output/bazel${EXE_EXT}"
+cp "$(get_bazel_bin_path)/src/tools/execlog/parser_deploy.jar" output/ \
+ || fail "Could not copy 'parser_deploy.jar' to 'output/"
+
clear_log
display "Build successful! Binary is here: ${BAZEL}"
pkgs/by-name/ba/bazel_9/patches/darwin_sleep.patch
+56
View File
@@ -0,0 +1,56 @@
diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc
index 67c35b201e..e50a58320e 100644
--- a/src/main/native/darwin/sleep_prevention_jni.cc
+++ b/src/main/native/darwin/sleep_prevention_jni.cc
@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0;
static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID;
int portable_push_disable_sleep() {
- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
- BAZEL_CHECK_GE(g_sleep_state_stack, 0);
- if (g_sleep_state_stack == 0) {
- BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID);
- CFStringRef reasonForActivity = CFSTR("build.bazel");
- IOReturn success = IOPMAssertionCreateWithName(
- kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity,
- &g_sleep_state_assertion);
- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
- }
- g_sleep_state_stack += 1;
- return 0;
+ // Unreliable, disable for now
+ return -1;
}
int portable_pop_disable_sleep() {
- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
- BAZEL_CHECK_GT(g_sleep_state_stack, 0);
- g_sleep_state_stack -= 1;
- if (g_sleep_state_stack == 0) {
- BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID);
- IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion);
- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
- g_sleep_state_assertion = kIOPMNullAssertionID;
- }
- return 0;
+ // Unreliable, disable for now
+ return -1;
}
} // namespace blaze_jni
diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc
index 3483aa7935..51782986ec 100644
--- a/src/main/native/darwin/system_suspension_monitor_jni.cc
+++ b/src/main/native/darwin/system_suspension_monitor_jni.cc
@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() {
// Register to receive system sleep notifications.
// Testing needs to be done manually. Use the logging to verify
// that sleeps are being caught here.
- suspend_state.connect_port = IORegisterForSystemPower(
- &suspend_state, &notifyPortRef, SleepCallBack, &notifierObject);
- BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL);
- IONotificationPortSetDispatchQueue(notifyPortRef, queue);
+ // XXX: Unreliable, disable for now
// Register to deal with SIGCONT.
// We register for SIGCONT because we can't catch SIGSTOP.
pkgs/by-name/ba/bazel_9/patches/default_bash.patch
+22
View File
@@ -0,0 +1,22 @@
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index a982b782e1..d49b047074 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -89,13 +89,13 @@ public class BazelRuleClassProvider {
public boolean useStrictActionEnv;
}
- private static final PathFragment FALLBACK_SHELL = PathFragment.create("/bin/bash");
+ private static final PathFragment FALLBACK_SHELL = PathFragment.create("@defaultBash@");
public static final ImmutableMap<OS, PathFragment> SHELL_EXECUTABLE =
ImmutableMap.<OS, PathFragment>builder()
.put(OS.WINDOWS, PathFragment.create("c:/msys64/usr/bin/bash.exe"))
- .put(OS.FREEBSD, PathFragment.create("/usr/local/bin/bash"))
- .put(OS.OPENBSD, PathFragment.create("/usr/local/bin/bash"))
+ .put(OS.FREEBSD, PathFragment.create("@defaultBash@"))
+ .put(OS.OPENBSD, PathFragment.create("@defaultBash@"))
.put(OS.UNKNOWN, FALLBACK_SHELL)
.buildOrThrow();

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