Merge commit 257aa2b046 into haskell-updates
This commit is contained in:
@@ -95,6 +95,10 @@ let
|
||||
system=$3
|
||||
outputDir=$4
|
||||
|
||||
# Default is 5, higher values effectively disable the warning.
|
||||
# This randomly breaks Eval.
|
||||
export GC_LARGE_ALLOC_WARN_INTERVAL=1000
|
||||
|
||||
export NIX_SHOW_STATS=1
|
||||
export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk"
|
||||
echo "Chunk $myChunk on $system start"
|
||||
|
||||
@@ -20,6 +20,46 @@ module.exports = async ({ github, context, core, dry }) => {
|
||||
})
|
||||
).data
|
||||
|
||||
// When the same change has already been merged to the target branch, a PR will still be
|
||||
// open and display the same changes - but will not actually have any effect. This causes
|
||||
// strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will
|
||||
// be detected, no maintainers pinged.
|
||||
// We can just check the temporary merge commit, and if it's empty the PR can safely be
|
||||
// closed - there are no further changes.
|
||||
if (pull_request.merge_commit_sha) {
|
||||
const commit = (
|
||||
await github.rest.repos.getCommit({
|
||||
...context.repo,
|
||||
ref: pull_request.merge_commit_sha,
|
||||
})
|
||||
).data
|
||||
|
||||
if (commit.files.length === 0) {
|
||||
const body = [
|
||||
`The diff for the temporary merge commit ${pull_request.merge_commit_sha} is empty.`,
|
||||
'The changes in this PR have almost certainly already been merged to the target branch.',
|
||||
].join('\n')
|
||||
|
||||
core.info(`PR #${item.number}: closed`)
|
||||
|
||||
if (!dry) {
|
||||
await github.rest.issues.createComment({
|
||||
...context.repo,
|
||||
issue_number: pull_number,
|
||||
body,
|
||||
})
|
||||
|
||||
await github.rest.pulls.update({
|
||||
...context.repo,
|
||||
pull_number,
|
||||
state: 'closed',
|
||||
})
|
||||
}
|
||||
|
||||
return {}
|
||||
}
|
||||
}
|
||||
|
||||
const reviews = await github.paginate(github.rest.pulls.listReviews, {
|
||||
...context.repo,
|
||||
pull_number,
|
||||
|
||||
@@ -32,6 +32,7 @@ runCommand "nixpkgs-vet"
|
||||
}
|
||||
''
|
||||
export NIX_STATE_DIR=$(mktemp -d)
|
||||
$NIXPKGS_VET_NIX_PACKAGE/bin/nix-store --init
|
||||
|
||||
nixpkgs-vet --base ${filteredBase} ${filteredHead}
|
||||
|
||||
|
||||
+6
-15
@@ -20,24 +20,15 @@ runCommand "nix-parse-${nix.name}"
|
||||
''
|
||||
export NIX_STORE_DIR=$TMPDIR/store
|
||||
export NIX_STATE_DIR=$TMPDIR/state
|
||||
nix-store --init
|
||||
|
||||
cd "${nixpkgs}"
|
||||
|
||||
# Passes all files to nix-instantiate at once.
|
||||
# Much faster, but will only show first error.
|
||||
parse-all() {
|
||||
find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null
|
||||
}
|
||||
|
||||
# Passes each file separately to nix-instantiate with -n1.
|
||||
# Much slower, but will show all errors.
|
||||
parse-each() {
|
||||
find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null
|
||||
}
|
||||
|
||||
if ! parse-all; then
|
||||
parse-each
|
||||
fi
|
||||
# This will only show the first parse error, not all of them. That's fine, because
|
||||
# the other CI jobs will report in more detail. This job is about checking parsing
|
||||
# across different implementations / versions, not about providing the best DX.
|
||||
# Returning all parse errors requires significantly more resources.
|
||||
find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null
|
||||
|
||||
touch $out
|
||||
''
|
||||
|
||||
@@ -22,6 +22,7 @@ lhapdf.section.md
|
||||
locales.section.md
|
||||
etc-files.section.md
|
||||
nginx.section.md
|
||||
nrfutil.section.md
|
||||
opengl.section.md
|
||||
shell-helpers.section.md
|
||||
python-tree-sitter.section.md
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
# nrfutil {#sec-nrfutil}
|
||||
|
||||
nrfutil can be built with its installables as following:
|
||||
|
||||
```nix
|
||||
(nrfutil.withExtensions [
|
||||
"nrfutil-completion"
|
||||
"nrfutil-device"
|
||||
"nrfutil-trace"
|
||||
])
|
||||
```
|
||||
|
||||
Keep in mind that all installables might not be available for every supported platform.
|
||||
@@ -325,6 +325,9 @@
|
||||
"sec-nixpkgs-release-25.05-notable-changes": [
|
||||
"release-notes.html#sec-nixpkgs-release-25.05-notable-changes"
|
||||
],
|
||||
"sec-nrfutil": [
|
||||
"index.html#sec-nrfutil"
|
||||
],
|
||||
"sec-overlays-install": [
|
||||
"index.html#sec-overlays-install"
|
||||
],
|
||||
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
- The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`.
|
||||
|
||||
- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html).
|
||||
|
||||
- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
|
||||
The latter was probably broken anyway.
|
||||
If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
|
||||
|
||||
@@ -791,6 +791,12 @@ lib.mapAttrs mkLicense (
|
||||
free = false;
|
||||
};
|
||||
|
||||
intel-eula = {
|
||||
fullName = "Intel End User License Agreement for Developer Tools";
|
||||
url = "https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/intelamtsdklicense.htm";
|
||||
free = false;
|
||||
};
|
||||
|
||||
interbase = {
|
||||
spdxId = "Interbase-1.0";
|
||||
fullName = "Interbase Public License v1.0";
|
||||
|
||||
@@ -4928,12 +4928,6 @@
|
||||
githubId = 640797;
|
||||
name = "Roger Qiu";
|
||||
};
|
||||
cmfwyp = {
|
||||
email = "cmfwyp@riseup.net";
|
||||
github = "cmfwyp";
|
||||
githubId = 20808761;
|
||||
name = "cmfwyp";
|
||||
};
|
||||
cmm = {
|
||||
email = "repo@cmm.kakpryg.net";
|
||||
github = "cmm";
|
||||
@@ -5040,12 +5034,6 @@
|
||||
githubId = 27779510;
|
||||
keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; } ];
|
||||
};
|
||||
codsl = {
|
||||
email = "codsl@riseup.net";
|
||||
github = "codsl";
|
||||
githubId = 6402559;
|
||||
name = "codsl";
|
||||
};
|
||||
codyopel = {
|
||||
email = "codyopel@gmail.com";
|
||||
github = "codyopel";
|
||||
@@ -14778,12 +14766,6 @@
|
||||
matrix = "@link2xt:matrix.org";
|
||||
name = "link2xt";
|
||||
};
|
||||
linquize = {
|
||||
email = "linquize@yahoo.com.hk";
|
||||
github = "linquize";
|
||||
githubId = 791115;
|
||||
name = "Linquize";
|
||||
};
|
||||
linsui = {
|
||||
email = "linsui555@gmail.com";
|
||||
github = "linsui";
|
||||
@@ -17309,12 +17291,6 @@
|
||||
githubId = 64710;
|
||||
name = "Matthew O'Gorman";
|
||||
};
|
||||
Mogria = {
|
||||
email = "m0gr14@gmail.com";
|
||||
github = "mogria";
|
||||
githubId = 754512;
|
||||
name = "Mogria";
|
||||
};
|
||||
mohe2015 = {
|
||||
name = "Moritz Hedtke";
|
||||
email = "Moritz.Hedtke@t-online.de";
|
||||
@@ -19217,12 +19193,6 @@
|
||||
githubId = 5339261;
|
||||
keys = [ { fingerprint = "4258 3FE7 12E9 6071 E84D 53C7 6E1D A270 0B72 746D"; } ];
|
||||
};
|
||||
oida = {
|
||||
email = "oida@posteo.de";
|
||||
github = "oida";
|
||||
githubId = 7249506;
|
||||
name = "oida";
|
||||
};
|
||||
oidro = {
|
||||
github = "oidro";
|
||||
githubId = 31112680;
|
||||
@@ -20867,12 +20837,6 @@
|
||||
githubId = 88623613;
|
||||
name = "ProggerX";
|
||||
};
|
||||
proglodyte = {
|
||||
email = "proglodyte23@gmail.com";
|
||||
github = "proglodyte";
|
||||
githubId = 18549627;
|
||||
name = "Proglodyte";
|
||||
};
|
||||
proglottis = {
|
||||
email = "proglottis@gmail.com";
|
||||
github = "proglottis";
|
||||
@@ -26044,6 +26008,12 @@
|
||||
githubId = 1761259;
|
||||
name = "Eric Roberts";
|
||||
};
|
||||
thrix = {
|
||||
email = "mvadkert@redhat.com";
|
||||
github = "thrix";
|
||||
githubId = 633969;
|
||||
name = "Miroslav Vadkerti";
|
||||
};
|
||||
thtrf = {
|
||||
email = "thtrf@proton.me";
|
||||
github = "thtrf";
|
||||
@@ -27398,12 +27368,6 @@
|
||||
githubId = 1476338;
|
||||
name = "Viktor Illmer";
|
||||
};
|
||||
vklquevs = {
|
||||
email = "vklquevs@gmail.com";
|
||||
github = "vklquevs";
|
||||
githubId = 1771234;
|
||||
name = "vklquevs";
|
||||
};
|
||||
vlaci = {
|
||||
email = "laszlo.vasko@outlook.com";
|
||||
github = "vlaci";
|
||||
@@ -27599,12 +27563,6 @@
|
||||
githubId = 988849;
|
||||
name = "Vasiliy Yorkin";
|
||||
};
|
||||
vyp = {
|
||||
email = "elisp.vim@gmail.com";
|
||||
github = "vyp";
|
||||
githubId = 3889405;
|
||||
name = "vyp";
|
||||
};
|
||||
w-lfchen = {
|
||||
email = "w-lfchen@posteo.net";
|
||||
github = "w-lfchen";
|
||||
|
||||
@@ -41,12 +41,12 @@ llscheck,,,,,,mrcjkb
|
||||
lmathx,,,,,5.3,alexshpilkin
|
||||
lmpfrlib,,,,,5.3,alexshpilkin
|
||||
loadkit,,,,,,alerque
|
||||
lpeg,,,,,,vyp
|
||||
lpeg,,,,,,
|
||||
lpeg_patterns,,,,,,
|
||||
lpeglabel,,,,1.6.0,,
|
||||
lrexlib-gnu,,,,,,
|
||||
lrexlib-oniguruma,,,,,,junestepp
|
||||
lrexlib-pcre,,,,,,vyp
|
||||
lrexlib-pcre,,,,,,
|
||||
lrexlib-posix,,,,,,
|
||||
lsp-progress.nvim,,,,,,gepbird
|
||||
lua-cjson,,,,,,
|
||||
@@ -86,7 +86,7 @@ lualdap,,,,,,aanderse
|
||||
lualine.nvim,,,http://luarocks.org/dev,,,
|
||||
lualogging,,,,,,
|
||||
luaossl,,,,,5.1,
|
||||
luaposix,,,,34.1.1-1,,vyp lblasc
|
||||
luaposix,,,,34.1.1-1,,lblasc
|
||||
luaprompt,,,,,,Freed-Wu
|
||||
luarepl,,,,,,
|
||||
luarocks,,,,,,mrcjkb teto
|
||||
@@ -96,7 +96,7 @@ luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
|
||||
luasec,,,,,,flosse
|
||||
luasnip,,,,,,
|
||||
luasocket,,,,,,
|
||||
luasql-sqlite3,,,,,,vyp
|
||||
luasql-sqlite3,,,,,,
|
||||
luassert,,,,,,
|
||||
luasystem,,,,,,
|
||||
luatext,,,,,,
|
||||
@@ -148,7 +148,7 @@ sofa,,,,,,f4z3r
|
||||
sqlite,,,,,,
|
||||
std._debug,,,,,,
|
||||
std.normalize,,,,,,
|
||||
stdlib,,,,41.2.2,,vyp
|
||||
stdlib,,,,41.2.2,,
|
||||
teal-language-server,,,,,,
|
||||
telescope-manix,,,,,,
|
||||
telescope.nvim,,,,,5.1,
|
||||
|
||||
|
@@ -16,6 +16,7 @@
|
||||
implementation if you use Gnome
|
||||
'';
|
||||
package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {
|
||||
nullable = true;
|
||||
example = "gnomeExtensions.gsconnect";
|
||||
};
|
||||
};
|
||||
@@ -24,7 +25,7 @@
|
||||
cfg = config.programs.kdeconnect;
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
environment.systemPackages = lib.optionals (cfg.package != null) [
|
||||
cfg.package
|
||||
];
|
||||
networking.firewall = rec {
|
||||
|
||||
@@ -296,6 +296,15 @@ in
|
||||
Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.
|
||||
'';
|
||||
};
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--rcon-bind=localhost:27015"
|
||||
"--rcon-password=..."
|
||||
];
|
||||
description = "Extra command line arguments.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -340,6 +349,7 @@ in
|
||||
(playerListOption "server-adminlist" cfg.admins)
|
||||
(playerListOption "server-whitelist" cfg.allowedPlayers)
|
||||
(lib.optionalString (cfg.allowedPlayers != [ ]) "--use-server-whitelist")
|
||||
cfg.extraArgs
|
||||
];
|
||||
|
||||
# Sandboxing
|
||||
|
||||
@@ -10,11 +10,12 @@ in
|
||||
{
|
||||
options.services.vnstat = {
|
||||
enable = lib.mkEnableOption "update of network usage statistics via vnstatd";
|
||||
package = lib.mkPackageOption pkgs "vnstat" { };
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.vnstat ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
users = {
|
||||
groups.vnstatd = { };
|
||||
@@ -37,7 +38,7 @@ in
|
||||
"man:vnstat.conf(5)"
|
||||
];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
|
||||
ExecStart = "${cfg.package}/bin/vnstatd -n";
|
||||
ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
|
||||
|
||||
# Hardening (from upstream example service)
|
||||
|
||||
@@ -276,6 +276,8 @@ in
|
||||
Extra config to append to avahi-daemon.conf.
|
||||
'';
|
||||
};
|
||||
|
||||
debug = lib.mkEnableOption "debug logging";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -356,7 +358,7 @@ in
|
||||
NotifyAccess = "main";
|
||||
BusName = "org.freedesktop.Avahi";
|
||||
Type = "dbus";
|
||||
ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}";
|
||||
ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}";
|
||||
ConfigurationDirectory = "avahi/services";
|
||||
|
||||
# Hardening
|
||||
|
||||
@@ -415,7 +415,7 @@ in
|
||||
lib.mapAttrsToListRecursive (attrPath: _: ''
|
||||
tmp="$(mktemp)"
|
||||
${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \
|
||||
'${attrPathToIndex attrPath} = $secret' /run/immich/config.json > "$tmp"
|
||||
'${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp"
|
||||
mv "$tmp" /run/immich/config.json
|
||||
'') cfg.secretSettings
|
||||
)
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
publish.userServices = true;
|
||||
publish.workstation = true;
|
||||
extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
|
||||
debug = true;
|
||||
};
|
||||
}
|
||||
// pkgs.lib.optionalAttrs networkd {
|
||||
|
||||
@@ -20,8 +20,8 @@ let
|
||||
sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2"
|
||||
sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";
|
||||
version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1"
|
||||
sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2025.2.2.1"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 1"
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
systemdLibs,
|
||||
tree-sitter,
|
||||
texinfo,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
zlib,
|
||||
|
||||
@@ -141,6 +141,8 @@ let
|
||||
++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
|
||||
"${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
|
||||
];
|
||||
|
||||
withWebkitgtk = withXwidgets && stdenv.hostPlatform.isLinux;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname =
|
||||
@@ -351,8 +353,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals withXinput2 [
|
||||
libXi
|
||||
]
|
||||
++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [
|
||||
webkitgtk_4_0
|
||||
++ lib.optionals withWebkitgtk [
|
||||
webkitgtk_4_1
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
sigtool
|
||||
@@ -504,7 +506,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
|
||||
broken =
|
||||
(withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk;
|
||||
knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
|
||||
"CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
|
||||
];
|
||||
|
||||
@@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
f4814n
|
||||
Mogria
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz";
|
||||
sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";
|
||||
sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
diff --git a/scripts/package-cli b/scripts/package-cli
|
||||
index a15d754926..bc450dbe4e 100755
|
||||
--- a/scripts/package-cli
|
||||
+++ b/scripts/package-cli
|
||||
@@ -3,7 +3,10 @@ set -e -x
|
||||
|
||||
cd $(dirname $0)/..
|
||||
|
||||
+runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s')
|
||||
+echo "$runc_require" >> go.mod
|
||||
. ./scripts/version.sh
|
||||
+sed -i '$d' go.mod
|
||||
|
||||
GO=${GO-go}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/scripts/version.sh b/scripts/version.sh
|
||||
index 37500a3b788d..96a6e6205472 100755
|
||||
--- a/scripts/version.sh
|
||||
+++ b/scripts/version.sh
|
||||
@@ -10,11 +10,11 @@ if [ -z "$NO_DAPPER" ]; then
|
||||
fi
|
||||
|
||||
get-module-version(){
|
||||
- go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1
|
||||
+ go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1
|
||||
}
|
||||
|
||||
get-module-path(){
|
||||
- go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1
|
||||
+ go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1
|
||||
}
|
||||
|
||||
PKG_CONTAINERD_K3S=$(get-module-path github.com/containerd/containerd/v2)
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
k3sVersion = "1.34.1+k3s1";
|
||||
k3sCommit = "24fc436e6ea59c56ebc37727baa4e6c9a201ee01";
|
||||
k3sRepoSha256 = "0fjkjsmig7xdn1filph2wbp69jva0jdkv8ax68wymvbqq4rn3s0k";
|
||||
k3sVendorHash = "sha256-87YMUWhwfFwm5bzcL42b7JFJbVWsoRtubH4jjYH/7mc=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.7.1-k3s1";
|
||||
k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
|
||||
containerdVersion = "2.1.4-k3s2";
|
||||
containerdSha256 = "18z6i6mzvllhglarsc6npn4k0m4akg7wm1rqc4a926dag47mgh8j";
|
||||
criCtlVersion = "1.34.0-k3s2";
|
||||
}
|
||||
@@ -478,5 +478,7 @@ buildGoModule (finalAttrs: {
|
||||
}
|
||||
// (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
|
||||
|
||||
meta = baseMeta;
|
||||
meta = baseMeta // {
|
||||
mainProgram = "k3s";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -41,4 +41,27 @@ in
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
k3s_1_34 =
|
||||
(common (
|
||||
(import ./1_34/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"34"
|
||||
];
|
||||
}
|
||||
) extraArgs).overrideAttrs
|
||||
{
|
||||
patches = [
|
||||
# Sets -mod=readonly for go list commands in scripts/version.sh to prevent go from using
|
||||
# the (intentional) incomplete vendor directory. Additionally, sets -e for go list to
|
||||
# change handling of erroneous packages.
|
||||
./1_34/version_sh_go_list.patch
|
||||
# Adds explicit require of opencontainers/runc to go.mod before version.sh is called and
|
||||
# removes it afterwards so that later build commands don't complain about inconsistent
|
||||
# vendoring.
|
||||
./1_34/go_runc_require.patch
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
nativeBuildInputs,
|
||||
passthru,
|
||||
meta,
|
||||
stdenv,
|
||||
undmg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ undmg ];
|
||||
|
||||
# don't break code signing
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv Thunderbird*.app "$out/Applications/${passthru.applicationName}.app"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
inherit passthru meta;
|
||||
}
|
||||
@@ -10,12 +10,9 @@
|
||||
fetchurl,
|
||||
config,
|
||||
wrapGAppsHook3,
|
||||
autoPatchelfHook,
|
||||
alsa-lib,
|
||||
curl,
|
||||
gtk3,
|
||||
writeScript,
|
||||
writeText,
|
||||
xidel,
|
||||
coreutils,
|
||||
gnused,
|
||||
@@ -23,18 +20,29 @@
|
||||
gnupg,
|
||||
runtimeShell,
|
||||
systemLocale ? config.i18n.defaultLocale or "en_US",
|
||||
patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections
|
||||
generated,
|
||||
versionSuffix ? "",
|
||||
applicationName ? "Thunderbird",
|
||||
# linux dependencies
|
||||
writeText,
|
||||
autoPatchelfHook,
|
||||
patchelfUnstable,
|
||||
alsa-lib,
|
||||
# darwin dependencies
|
||||
undmg,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (generated) version sources;
|
||||
|
||||
pname = "thunderbird-bin";
|
||||
|
||||
mozillaPlatforms = {
|
||||
i686-linux = "linux-i686";
|
||||
x86_64-linux = "linux-x86_64";
|
||||
# bundles are universal and can be re-used for both darwin architectures
|
||||
aarch64-darwin = "mac";
|
||||
x86_64-darwin = "mac";
|
||||
};
|
||||
|
||||
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
|
||||
@@ -43,12 +51,6 @@ let
|
||||
|
||||
sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch;
|
||||
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
}
|
||||
// config.thunderbird.policies or { };
|
||||
policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
|
||||
|
||||
defaultSource = lib.findFirst (sourceMatches "en-US") { } sources;
|
||||
|
||||
mozLocale =
|
||||
@@ -59,50 +61,23 @@ let
|
||||
|
||||
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
|
||||
|
||||
pname = "thunderbird-bin";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (source) url sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
autoPatchelfHook
|
||||
patchelfUnstable
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
];
|
||||
# Thunderbird uses "relrhack" to manually process relocations from a fixed offset
|
||||
patchelfFlags = [ "--no-clobber-old-sections" ];
|
||||
meta = {
|
||||
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
|
||||
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
|
||||
homepage = "http://www.mozilla.org/thunderbird/";
|
||||
mainProgram = "thunderbird";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ lovesegfault ];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
# Don't download updates from Mozilla directly
|
||||
echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
|
||||
cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
|
||||
|
||||
# wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
|
||||
ln -s "$out/usr/lib" "$out/lib"
|
||||
|
||||
gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
|
||||
|
||||
# See: https://github.com/mozilla/policy-templates/blob/master/README.md
|
||||
mkdir -p "$out/lib/thunderbird-bin-${version}/distribution";
|
||||
ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json";
|
||||
'';
|
||||
|
||||
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
|
||||
updateScript = import ./../../browsers/firefox-bin/update.nix {
|
||||
inherit
|
||||
pname
|
||||
writeScript
|
||||
@@ -120,22 +95,48 @@ stdenv.mkDerivation {
|
||||
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit applicationName;
|
||||
inherit
|
||||
applicationName
|
||||
updateScript
|
||||
gtk3
|
||||
;
|
||||
binaryName = "thunderbird";
|
||||
gssSupport = true;
|
||||
gtk3 = gtk3;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
|
||||
description = "Mozilla Thunderbird, a full-featured email client (binary package)";
|
||||
homepage = "http://www.mozilla.org/thunderbird/";
|
||||
mainProgram = "thunderbird";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ lovesegfault ];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
in
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
import ./darwin.nix {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
passthru
|
||||
meta
|
||||
stdenv
|
||||
undmg
|
||||
;
|
||||
}
|
||||
else
|
||||
import ./linux.nix {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
passthru
|
||||
meta
|
||||
stdenv
|
||||
config
|
||||
writeText
|
||||
autoPatchelfHook
|
||||
patchelfUnstable
|
||||
alsa-lib
|
||||
;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
nativeBuildInputs,
|
||||
passthru,
|
||||
meta,
|
||||
stdenv,
|
||||
config,
|
||||
writeText,
|
||||
autoPatchelfHook,
|
||||
patchelfUnstable,
|
||||
alsa-lib,
|
||||
}:
|
||||
|
||||
let
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
}
|
||||
// config.thunderbird.policies or { };
|
||||
|
||||
policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ [
|
||||
autoPatchelfHook
|
||||
patchelfUnstable
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
# Thunderbird uses "relrhack" to manually process relocations from a fixed offset
|
||||
patchelfFlags = [ "--no-clobber-old-sections" ];
|
||||
|
||||
postPatch = ''
|
||||
# Don't download updates from Mozilla directly
|
||||
echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
|
||||
cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
|
||||
|
||||
# wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
|
||||
ln -s "$out/usr/lib" "$out/lib"
|
||||
|
||||
gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
|
||||
|
||||
# See: https://github.com/mozilla/policy-templates/blob/master/README.md
|
||||
mkdir -p "$out/lib/thunderbird-bin-${version}/distribution";
|
||||
ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json";
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
inherit passthru meta;
|
||||
}
|
||||
@@ -54,7 +54,7 @@
|
||||
symlinkJoin,
|
||||
systemd,
|
||||
tzdata,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
which,
|
||||
xorg,
|
||||
zlib,
|
||||
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
|
||||
speex
|
||||
stdenv.cc.cc
|
||||
(lib.getLib systemd)
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXaw
|
||||
xorg.libXmu
|
||||
@@ -313,6 +313,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
license = licenses.unfree;
|
||||
description = "Citrix Workspace";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -19,13 +19,13 @@ let
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "2.0.8";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QkCLFztzaH9MvgP6HWUr5Z8yIrKlY6/t2VaZwai/H8Q=";
|
||||
hash = "sha256-N0+i5sj/cTPDv6q428b3Y0hsPRxIl96+RIuS1AyeTbc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs=";
|
||||
|
||||
@@ -315,7 +315,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./readd-explicit-zlib-link.patch
|
||||
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "25.8") [
|
||||
++ lib.optionals (variant == "collabora") [
|
||||
# Backport patch to fix build with Poppler 25.05
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
|
||||
@@ -323,13 +323,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "24.8") [
|
||||
(fetchpatch2 {
|
||||
name = "icu74-compat.patch";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
|
||||
hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (variant == "collabora") [
|
||||
./fix-unpack-collabora.patch
|
||||
];
|
||||
@@ -594,6 +587,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# cannot find headers, no idea why
|
||||
"--without-system-boost"
|
||||
|
||||
"--with-system-rhino"
|
||||
"--with-rhino-jar=${rhino}/share/java/js.jar"
|
||||
|
||||
"--without-system-java-websocket"
|
||||
]
|
||||
++ optionals kdeIntegration [
|
||||
"--enable-kf6"
|
||||
@@ -603,21 +601,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-system-beanshell"
|
||||
"--with-ant-home=${ant.home}"
|
||||
"--with-beanshell-jar=${bsh}"
|
||||
]
|
||||
++ (
|
||||
if variant == "fresh" || variant == "collabora" then
|
||||
[
|
||||
"--with-system-rhino"
|
||||
"--with-rhino-jar=${rhino}/share/java/js.jar"
|
||||
|
||||
"--without-system-java-websocket"
|
||||
]
|
||||
else
|
||||
[
|
||||
# our Rhino is too new for older versions
|
||||
"--without-system-rhino"
|
||||
]
|
||||
);
|
||||
];
|
||||
|
||||
env = {
|
||||
# FIXME: this is a hack, because the right cflags are not being picked up
|
||||
|
||||
@@ -38,66 +38,16 @@
|
||||
m_pDoc->InsertTab(0, u"Formula"_ustr);
|
||||
|
||||
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
|
||||
--- a/sw/qa/extras/layout/layout3.cxx
|
||||
+++ b/sw/qa/extras/layout/layout3.cxx
|
||||
@@ -3640,6 +3642,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking a first bidi portion correctly underflows in LTR text
|
||||
createSwDoc("tdf56408-ltr.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -3654,6 +3656,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking a first bidi portion correctly underflows in RTL text
|
||||
createSwDoc("tdf56408-rtl.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -3671,6 +3671,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// The fix for tdf#56408 introduced a change to line breaking between text with
|
||||
// direction changes. This test verifies behavior in the trivial case, when a
|
||||
// break opportunity exists at the direction change boundary.
|
||||
@@ -3684,6 +3687,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify there is no crash/assertion for underflow after a number field
|
||||
createSwDoc("tdf56408-after-field.fodt");
|
||||
}
|
||||
@@ -3722,6 +3722,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
|
||||
createSwDoc("tdf157829-ltr.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -3736,6 +3740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL)
|
||||
{
|
||||
+ return; // fails due to missing Noto Sans Hebrew
|
||||
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
|
||||
createSwDoc("tdf157829-rtl.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
||||
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
||||
@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
|
||||
@@ -447,6 +447,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications)
|
||||
{
|
||||
+ return; // flaky on GTK
|
||||
+
|
||||
SwXTextDocument* pXTextDocument = createDoc("search.odt");
|
||||
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
|
||||
createDoc("search.odt");
|
||||
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
|
||||
setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
|
||||
@@ -970,6 +972,8 @@ namespace {
|
||||
|
||||
@@ -132,9 +82,9 @@
|
||||
{
|
||||
+ return; // flaky on GTK
|
||||
+
|
||||
comphelper::LibreOfficeKit::setActive();
|
||||
SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
|
||||
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)
|
||||
@@ -165,3 +115,84 @@
|
||||
aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
|
||||
saveAsPDF(u"tdf164106.fodt");
|
||||
|
||||
--- a/sw/qa/extras/layout/layout4.cxx
|
||||
+++ b/sw/qa/extras/layout/layout4.cxx
|
||||
@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking a first bidi portion correctly underflows in LTR text
|
||||
createSwDoc("tdf56408-ltr.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking a first bidi portion correctly underflows in RTL text
|
||||
createSwDoc("tdf56408-rtl.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// The fix for tdf#56408 introduced a change to line breaking between text with
|
||||
// direction changes. This test verifies behavior in the trivial case, when a
|
||||
// break opportunity exists at the direction change boundary.
|
||||
@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify there is no crash/assertion for underflow after a number field
|
||||
createSwDoc("tdf56408-after-field.fodt");
|
||||
}
|
||||
@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
|
||||
createSwDoc("tdf157829-ltr.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans Hebrew
|
||||
// Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
|
||||
createSwDoc("tdf157829-rtl.fodt");
|
||||
auto pXmlDoc = parseLayoutDump();
|
||||
--- a/sw/qa/extras/layout/layout5.cxx
|
||||
+++ b/sw/qa/extras/layout/layout5.cxx
|
||||
@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans
|
||||
+
|
||||
createSwDoc("tdf166152.fodt");
|
||||
|
||||
auto* pWrtShell = getSwDocShell()->GetWrtShell();
|
||||
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
|
||||
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
|
||||
@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
|
||||
{
|
||||
+ return; // fails due to missing font: Noto Sans
|
||||
saveAsPDF(u"tdf164106.fodt");
|
||||
|
||||
auto pPdfDocument = parsePDFExport();
|
||||
--- i/sc/qa/extras/scsolverobj.cxx
|
||||
+++ w/sc/qa/extras/scsolverobj.cxx
|
||||
@@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const
|
||||
// Creates a model using the XSolverSettings API checks if it is accessible via the API
|
||||
void ScSolverSettingsObj::testXSolverSettings()
|
||||
{
|
||||
+ return;
|
||||
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);
|
||||
|
||||
+56
-56
@@ -147,11 +147,11 @@
|
||||
md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.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.2.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz";
|
||||
sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c";
|
||||
md5 = "";
|
||||
md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz";
|
||||
md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "Firebird-3.0.7.33374-0.tar.bz2";
|
||||
@@ -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";
|
||||
@@ -448,11 +448,11 @@
|
||||
md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
|
||||
}
|
||||
{
|
||||
name = "harfbuzz-11.4.3.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/harfbuzz-11.4.3.tar.xz";
|
||||
sha256 = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d";
|
||||
name = "harfbuzz-11.5.1.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz";
|
||||
sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1";
|
||||
md5 = "";
|
||||
md5name = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d-harfbuzz-11.4.3.tar.xz";
|
||||
md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "hsqldb_1_8_0.zip";
|
||||
@@ -581,18 +581,18 @@
|
||||
md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
|
||||
}
|
||||
{
|
||||
name = "libjpeg-turbo-3.1.1.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.1.tar.gz";
|
||||
sha256 = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72";
|
||||
name = "libjpeg-turbo-3.1.2.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz";
|
||||
sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6";
|
||||
md5 = "";
|
||||
md5name = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72-libjpeg-turbo-3.1.1.tar.gz";
|
||||
md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "language-subtag-registry-2025-07-15.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-07-15.tar.bz2";
|
||||
sha256 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052";
|
||||
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 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052-language-subtag-registry-2025-07-15.tar.bz2";
|
||||
md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "lcms2-2.17.tar.gz";
|
||||
@@ -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";
|
||||
@@ -679,11 +679,11 @@
|
||||
md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.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";
|
||||
@@ -700,18 +700,18 @@
|
||||
md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "lxml-6.0.1.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lxml-6.0.1.tar.gz";
|
||||
sha256 = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690";
|
||||
name = "lxml-6.0.2.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz";
|
||||
sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62";
|
||||
md5 = "";
|
||||
md5name = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690-lxml-6.0.1.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.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-3.1.0.tar.xz";
|
||||
@@ -728,11 +728,11 @@
|
||||
md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "meson-1.8.0.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/meson-1.8.0.tar.gz";
|
||||
sha256 = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f";
|
||||
name = "meson-1.8.3.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz";
|
||||
sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf";
|
||||
md5 = "";
|
||||
md5name = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f-meson-1.8.0.tar.gz";
|
||||
md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libmspub-0.1.4.tar.xz";
|
||||
@@ -756,11 +756,11 @@
|
||||
md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "nss-3.115.1-with-nspr-4.37.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/nss-3.115.1-with-nspr-4.37.tar.gz";
|
||||
sha256 = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320";
|
||||
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";
|
||||
md5 = "";
|
||||
md5name = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320-nss-3.115.1-with-nspr-4.37.tar.gz";
|
||||
md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libodfgen-0.1.8.tar.xz";
|
||||
@@ -798,11 +798,11 @@
|
||||
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.18.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz";
|
||||
sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b";
|
||||
md5 = "";
|
||||
md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";
|
||||
md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "liborcus-0.20.1.tar.xz";
|
||||
@@ -840,18 +840,18 @@
|
||||
md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.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.09.1.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz";
|
||||
sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658";
|
||||
md5 = "";
|
||||
md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
|
||||
md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-data-0.4.12.tar.gz";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "1dghyg96daa9iff7njanfy8v0lqql3i9vy6cqysdq141rgdbglql";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-help-25.8.1.1.tar.xz";
|
||||
sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "0gig194j66rxf678n236r7wnqv12w1bknm1kkjj8155y59n2qkjv";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-25.8.1.1.tar.xz";
|
||||
sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "0x1vx27w8kw4qfjhhdmh5zx68svh27yiy43f057qd61rbnds0p85";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-translations-25.8.1.1.tar.xz";
|
||||
sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
"25.8.1.1"
|
||||
"25.8.2.2"
|
||||
|
||||
+158
-109
@@ -14,11 +14,11 @@
|
||||
md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "boost_1_85_0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz";
|
||||
sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a";
|
||||
name = "boost_1_86_0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz";
|
||||
sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c";
|
||||
md5 = "";
|
||||
md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz";
|
||||
md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "box2d-2.4.1.tar.gz";
|
||||
@@ -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";
|
||||
@@ -161,11 +161,11 @@
|
||||
md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "fontconfig-2.15.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz";
|
||||
sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e";
|
||||
name = "fontconfig-2.16.2.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz";
|
||||
sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2";
|
||||
md5 = "";
|
||||
md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz";
|
||||
md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "crosextrafonts-20130214.tar.gz";
|
||||
@@ -315,11 +315,11 @@
|
||||
md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip";
|
||||
}
|
||||
{
|
||||
name = "culmus-0.133.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz";
|
||||
sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05";
|
||||
name = "culmus-0.140.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz";
|
||||
sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3";
|
||||
md5 = "";
|
||||
md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz";
|
||||
md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libre-hebrew-1.0.tar.gz";
|
||||
@@ -343,11 +343,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";
|
||||
@@ -356,6 +356,55 @@
|
||||
md5 = "";
|
||||
md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
|
||||
}
|
||||
{
|
||||
name = "Agdasima-2.002.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip";
|
||||
sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3";
|
||||
md5 = "";
|
||||
md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip";
|
||||
}
|
||||
{
|
||||
name = "Bacasime_Antique-2.000.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip";
|
||||
sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a";
|
||||
md5 = "";
|
||||
md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip";
|
||||
}
|
||||
{
|
||||
name = "Belanosima-2.000.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip";
|
||||
sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449";
|
||||
md5 = "";
|
||||
md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip";
|
||||
}
|
||||
{
|
||||
name = "Caprasimo-1.001.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip";
|
||||
sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b";
|
||||
md5 = "";
|
||||
md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip";
|
||||
}
|
||||
{
|
||||
name = "Lugrasimo-1.001.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip";
|
||||
sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503";
|
||||
md5 = "";
|
||||
md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip";
|
||||
}
|
||||
{
|
||||
name = "Lumanosimo-1.010.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip";
|
||||
sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f";
|
||||
md5 = "";
|
||||
md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip";
|
||||
}
|
||||
{
|
||||
name = "Lunasima-2.009.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip";
|
||||
sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393";
|
||||
md5 = "";
|
||||
md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip";
|
||||
}
|
||||
{
|
||||
name = "libfreehand-0.1.2.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
|
||||
@@ -371,11 +420,11 @@
|
||||
md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "frozen-1.1.1.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz";
|
||||
sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45";
|
||||
name = "frozen-1.2.0.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz";
|
||||
sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823";
|
||||
md5 = "";
|
||||
md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz";
|
||||
md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "glm-1.0.1.zip";
|
||||
@@ -385,11 +434,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";
|
||||
@@ -434,25 +483,25 @@
|
||||
md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "icu4c-74_2-src.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz";
|
||||
sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c";
|
||||
name = "icu4c-75_1-src.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz";
|
||||
sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef";
|
||||
md5 = "";
|
||||
md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz";
|
||||
md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz";
|
||||
}
|
||||
{
|
||||
name = "icu4c-74_2-data.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip";
|
||||
sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6";
|
||||
name = "icu4c-75_1-data.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip";
|
||||
sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1";
|
||||
md5 = "";
|
||||
md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip";
|
||||
md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip";
|
||||
}
|
||||
{
|
||||
name = "Java-WebSocket-1.5.6.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz";
|
||||
sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f";
|
||||
name = "Java-WebSocket-1.6.0.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz";
|
||||
sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728";
|
||||
md5 = "";
|
||||
md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz";
|
||||
md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "flow-engine-0.9.4.zip";
|
||||
@@ -539,18 +588,18 @@
|
||||
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.16.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz";
|
||||
sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51";
|
||||
name = "lcms2-2.17.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz";
|
||||
sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074";
|
||||
md5 = "";
|
||||
md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz";
|
||||
md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libassuan-3.0.2.tar.bz2";
|
||||
@@ -581,11 +630,11 @@
|
||||
md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libffi-3.4.4.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz";
|
||||
sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676";
|
||||
name = "libffi-3.5.2.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz";
|
||||
sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc";
|
||||
md5 = "";
|
||||
md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
|
||||
md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libgpg-error-1.55.tar.bz2";
|
||||
@@ -616,25 +665,25 @@
|
||||
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.5.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz";
|
||||
sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917";
|
||||
name = "xmlsec1-1.3.6.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz";
|
||||
sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f";
|
||||
md5 = "";
|
||||
md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz";
|
||||
md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libxml2-2.13.8.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz";
|
||||
sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a";
|
||||
name = "libxml2-2.14.5.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz";
|
||||
sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b";
|
||||
md5 = "";
|
||||
md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz";
|
||||
md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libxslt-1.1.43.tar.xz";
|
||||
@@ -735,18 +784,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.17.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz";
|
||||
sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce";
|
||||
md5 = "";
|
||||
md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
|
||||
md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "liborcus-0.19.2.tar.xz";
|
||||
@@ -763,11 +812,11 @@
|
||||
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "pdfium-6425.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2";
|
||||
sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c";
|
||||
name = "pdfium-6764.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2";
|
||||
sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49";
|
||||
md5 = "";
|
||||
md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2";
|
||||
md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "pixman-0.42.2.tar.gz";
|
||||
@@ -777,11 +826,11 @@
|
||||
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.50.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz";
|
||||
sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307";
|
||||
md5 = "";
|
||||
md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz";
|
||||
md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "tiff-4.7.0.tar.xz";
|
||||
@@ -791,11 +840,11 @@
|
||||
md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-25.04.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz";
|
||||
sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d";
|
||||
name = "poppler-25.08.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";
|
||||
sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";
|
||||
md5 = "";
|
||||
md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz";
|
||||
md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-data-0.4.12.tar.gz";
|
||||
@@ -805,18 +854,18 @@
|
||||
md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "postgresql-13.19.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2";
|
||||
sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea";
|
||||
name = "postgresql-14.19.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2";
|
||||
sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80";
|
||||
md5 = "";
|
||||
md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2";
|
||||
md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "Python-3.9.22.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz";
|
||||
sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec";
|
||||
name = "Python-3.10.18.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz";
|
||||
sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f";
|
||||
md5 = "";
|
||||
md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz";
|
||||
md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libqxp-0.0.2.tar.xz";
|
||||
@@ -826,11 +875,11 @@
|
||||
md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "raptor2-2.0.15.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
|
||||
sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
|
||||
md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
|
||||
md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
|
||||
name = "raptor2-2.0.16.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz";
|
||||
sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680";
|
||||
md5 = "";
|
||||
md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "rasqal-0.9.33.tar.gz";
|
||||
@@ -854,18 +903,18 @@
|
||||
md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "rhino-1.7.14.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip";
|
||||
sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c";
|
||||
name = "rhino-1.7.15.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip";
|
||||
sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa";
|
||||
md5 = "";
|
||||
md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip";
|
||||
md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";
|
||||
}
|
||||
{
|
||||
name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
|
||||
sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01";
|
||||
name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
|
||||
sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d";
|
||||
md5 = "";
|
||||
md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
|
||||
md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libstaroffice-0.0.7.tar.xz";
|
||||
@@ -931,11 +980,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";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz";
|
||||
sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz";
|
||||
sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, ... }:
|
||||
fetchurl {
|
||||
sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz";
|
||||
sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh";
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz";
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
"24.8.7.2"
|
||||
"25.2.6.2"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
makeWrapper,
|
||||
config,
|
||||
cudaPackages,
|
||||
rocmPackages_6,
|
||||
rocmPackages,
|
||||
ompSupport ? true,
|
||||
openclSupport ? false,
|
||||
rocmSupport ? config.rocmSupport,
|
||||
@@ -23,7 +23,6 @@
|
||||
}:
|
||||
let
|
||||
inherit (llvmPackages) stdenv;
|
||||
rocmPackages = rocmPackages_6;
|
||||
llvmPackages = llvmPackages_18;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
electron_37,
|
||||
electron,
|
||||
nodejs_22,
|
||||
yarn-berry_4,
|
||||
cacert,
|
||||
@@ -28,7 +28,6 @@ let
|
||||
hostPlatform = stdenvNoCC.hostPlatform;
|
||||
nodePlatform = hostPlatform.node.platform;
|
||||
nodeArch = hostPlatform.node.arch;
|
||||
electron = electron_37;
|
||||
nodejs = nodejs_22;
|
||||
yarn-berry = yarn-berry_4.override { inherit nodejs; };
|
||||
productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE";
|
||||
@@ -37,17 +36,17 @@ in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = binName;
|
||||
|
||||
version = "0.24.1";
|
||||
version = "0.25.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "toeverything";
|
||||
repo = "AFFiNE";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yq5TD5yInv+0d1S6M58I8CneCAGUwH0ThGrEJfLIrX0=";
|
||||
hash = "sha256-TrPyxXgrhzODyiamLU49vbIwDzau+jI9D8VWGa734x8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-tRDc7Rky59Rh08QTNiG3yopErHJzARxN8BZGrSUECLE=";
|
||||
hash = "sha256-7btQd3i3rfJ3pJV7OXhSIz17Uy48D3OwrsXh/kls8Hc=";
|
||||
};
|
||||
yarnOfflineCache = stdenvNoCC.mkDerivation {
|
||||
name = "yarn-offline-cache";
|
||||
@@ -92,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
dontInstall = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-U2FGvdtGiM97aXmbfNIfi87hvwDkd1dvlAABYiDgAGI=";
|
||||
outputHash = "sha256-cQFX49K27Q8pKRiZ+UqK4LIwfi3VEgZ7qS7N/rUj8rM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals hostPlatform.isDarwin [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
openssl,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
@@ -52,13 +52,15 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
gtk3
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
];
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
homepage = "https://github.com/btpf/Alexandria";
|
||||
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
|
||||
description = "Minimalistic cross-platform eBook reader";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
glibc,
|
||||
gtk3,
|
||||
libappindicator,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
e2fsprogs,
|
||||
libnotify,
|
||||
libgit2,
|
||||
@@ -67,7 +67,7 @@ buildDotnetModule {
|
||||
glibc
|
||||
gtk3
|
||||
libappindicator
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
e2fsprogs
|
||||
libnotify
|
||||
libgit2
|
||||
@@ -116,6 +116,8 @@ buildDotnetModule {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher";
|
||||
description = "Front-end for dealing with AM2R updates and mods";
|
||||
longDescription = ''
|
||||
|
||||
@@ -28,6 +28,8 @@ buildGoModule (finalAttrs: {
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.44.5";
|
||||
|
||||
# Update only together with 'anytype' package.
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gtest,
|
||||
tinycmmc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "argpp";
|
||||
version = "0-unstable-2022-08-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Grumbel";
|
||||
repo = "argpp";
|
||||
rev = "9e1d54f8ed20af0aa5857e6653ab605b2ab63d5c";
|
||||
sha256 = "sha256-unfAFxgvv1BOUEqrYYMFfouGe2xIcKJ3ithCel1P9sc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
gtest
|
||||
tinycmmc
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Argument Parser for C++";
|
||||
maintainers = [ lib.maintainers.SchweGELBin ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "agg";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "agg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k=";
|
||||
hash = "sha256-FjAf/rhyxsm4LHoko4QRA9t5e+qKIgO2kSd48Zmf224=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc=";
|
||||
cargoHash = "sha256-CeXcpSD/6qPzA8nrSyC3oDFBpjFYNfDPySQxSOZPlgc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atac";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julien-cpsn";
|
||||
repo = "ATAC";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc=";
|
||||
hash = "sha256-PXSjyMe7Rcoeczm/cqFgn1Ra66T9cA34NdfaqLTljmc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc=";
|
||||
cargoHash = "sha256-qjg5yxWRcNnmrl91kogUEOfFOs06tcgmK2hpqx6nftU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.92";
|
||||
version = "2.0.93";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X1B2L8bh3iXPZ5NpaH+VP67i/ykmd0IVXu0dg6XmUGo=";
|
||||
sha256 = "sha256-EJxHmzNJvWtchFnptTK03jyPWMzFKO6jxte30xipdM8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4ZV5ef033cZdMJaQD0gLNaKe8XfQzhF7mADm7N0NxvA=";
|
||||
cargoHash = "sha256-kfsc7QXvRczatRwvPeMPXuD6GC9qd6zBwUd3EYXALSc=";
|
||||
|
||||
meta = {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@@ -83,9 +83,9 @@
|
||||
|
||||
containerapp = mkAzExtension rec {
|
||||
pname = "containerapp";
|
||||
version = "1.2.0b3";
|
||||
version = "1.2.0b4";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-UK7fbWI7NoW8sBo3OEafXX3DolFNQXhFDMHUoE1h/qA=";
|
||||
hash = "sha256-v2Mu46qVpDKjGARgGkKzQm5QcK4Msj4XgdgWZwI8fS0=";
|
||||
description = "Microsoft Azure Command-Line Tools Containerapp Extension";
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
docker
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
ninja,
|
||||
pkg-config,
|
||||
sqlite,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libsecret
|
||||
openssl
|
||||
sqlite
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
@@ -78,6 +78,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
description = "E-mail client for GNOME";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/balsa";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
fetchurl,
|
||||
desktop-file-utils,
|
||||
dpkg,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
runScript ? "BitComet",
|
||||
}:
|
||||
|
||||
@@ -15,6 +15,8 @@ let
|
||||
version = "2.15.0";
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
homepage = "https://www.bitcomet.com";
|
||||
description = "BitTorrent download client";
|
||||
mainProgram = "BitComet";
|
||||
@@ -82,7 +84,7 @@ buildFHSEnv {
|
||||
pkgs:
|
||||
[
|
||||
bitcomet
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
]
|
||||
++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs;
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "bitrise";
|
||||
version = "2.34.3";
|
||||
version = "2.34.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitrise-io";
|
||||
repo = "bitrise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Px4u3Jc3HbTN9NRGFYwTVL0/g+PsFw+JxEyOuTSTQbc=";
|
||||
hash = "sha256-QsGF5lDnY55OGdFagGJfXcq9/2P6qzmoHx64ijOkRfo=";
|
||||
};
|
||||
|
||||
# many tests rely on writable $HOME/.bitrise and require network access
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
unar,
|
||||
unzip,
|
||||
vala,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
|
||||
poppler
|
||||
python3
|
||||
sqlite
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -92,6 +92,8 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
description = "Simple, focused eBook reader";
|
||||
mainProgram = "com.github.babluboy.bookworm";
|
||||
longDescription = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bootdev-cli";
|
||||
version = "1.20.4";
|
||||
version = "1.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootdotdev";
|
||||
repo = "bootdev";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ayjHhnnP6YWKMItsAw+nnScf1/eEHN2f7cOIkskE3mM=";
|
||||
hash = "sha256-iVL2nRQb4A7UfhiQSBBbaxM1Yqc2pESvRfQ3xSjGq10=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";
|
||||
|
||||
@@ -19,20 +19,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "2.12.0";
|
||||
version = "2.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5yYcclJBb5kKaDr9irkLQBa6Tg8yO1LWh89ntBiMQho=";
|
||||
hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-mLl8igkdujzI4Fz4SoUrCdnI2KUo6DsNtPdAhwjYpac=";
|
||||
npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://www.impallari.com/cabin";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ cmfwyp ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "caligula";
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifd3f";
|
||||
repo = "caligula";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
|
||||
hash = "sha256-eOhMT47QcuMpBxNT10KgXOCxmb36qhdvP0xQu0wVhbk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k=";
|
||||
cargoHash = "sha256-p9ozKJsjUkNFxMaSPpO4iOg2/cfbSpSdzUFg3YnwEq0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.105";
|
||||
version = "0.9.106";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o=";
|
||||
hash = "sha256-jgxoEKl6kAF8dj6TB42nSXE8Ez/da/yagbVVHcC0L0Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o=";
|
||||
cargoHash = "sha256-XM9N74w5lbQFC6uZO3Vy45puZxSe6bthZwOQVrLv3ac=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://cccc.sourceforge.net/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.linquize ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk";
|
||||
version = "5.0-20251001";
|
||||
version = "5.0-20251014";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-GLGW5gGmVTPQ3/MmJvu4h1FNhojng9f2CYtLTrxk2FM=";
|
||||
hash = "sha256-DtRpScaApfQuNCzEiizmC8/CzIue67F2h3takfgpQ1w=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2025-10-09";
|
||||
version = "0.4.0-unstable-2025-10-14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "abd542d16e7351ae7fff3c56b40172315dcf690c";
|
||||
hash = "sha256-ncO+/M4ZU0yZOd2DeL9ZCmZS+FhrByeiOtlY/By7bmQ=";
|
||||
rev = "1e7dd4b2b83980dba5020b3787fa4c3f4dc5b68a";
|
||||
hash = "sha256-zzkppK0B1udSODKwLOJtE0kEQVLWD9xMhNvnH0wzoK0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "clickable";
|
||||
version = "8.5.0";
|
||||
version = "8.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "clickable";
|
||||
repo = "clickable";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hQkRntdOlWLK+vVrdiWEkYIMK+ymEEC5ajh7+L2fH2g=";
|
||||
hash = "sha256-rgIp4LCSUamImYhgFeG+XEpgnxHcKylWRB2CCx9u5S0=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.8.26-lts";
|
||||
hash = "sha256-jzgfbM0WRdbSr0OXB9t0e1BjZQwZaEwIfzg7W4Z11c0=";
|
||||
version = "25.8.10.7-lts";
|
||||
hash = "sha256-EOZ2AfeBeXAWQqa25eQX3loE+xegt03lsCU1aQt/Ebs=";
|
||||
lts = true;
|
||||
nixUpdateExtraArgs = [
|
||||
"--version-regex"
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.linquize ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
description = "Open source, cross platform, free C, C++ and Fortran IDE";
|
||||
longDescription = ''
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codebook";
|
||||
version = "0.3.13";
|
||||
version = "0.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blopker";
|
||||
repo = "codebook";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-46RSHbr9vVyVYXAV/+A6PSz2qokDwQjY51jnIQ11Dls=";
|
||||
hash = "sha256-XS4neGqi0tLzs53jV37mDsfC8bAXwpqinoe3gT8GYZw=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/codebook-lsp";
|
||||
cargoHash = "sha256-/7ci8of8KfD7ne3XjXA+tVq1x3HmQWKWh1wO4zA0Elg=";
|
||||
cargoHash = "sha256-39ROafYvaTL3wZCUyycGV0PCnR/mr+rJK3/lrvfqKIM=";
|
||||
|
||||
# Integration tests require internet access for dictionaries
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,25 +8,25 @@
|
||||
|
||||
let
|
||||
pname = "dbgate";
|
||||
version = "6.6.4";
|
||||
version = "6.6.5";
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
|
||||
hash = "sha256-pwG+muAEVmyIK9eiCrydZ0glxPK5FGl7b3ps/8xeFgE=";
|
||||
hash = "sha256-DIlFERRnNdh6VzApYNDoiUb78lESfE2RTgmEsffJ5EI=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
|
||||
hash = "sha256-4xsxYbVbbfxJ70CaB3z/reRoPgBom/XX6/YfT30uDpY=";
|
||||
hash = "sha256-xn6KhD08K57T9kWy7AHvIar22zGXV+6/geK3dGIxKhk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
|
||||
hash = "sha256-plG9n/JtPmyUcJoP4kcAttKpzpT7ytt2M82CT0zZ4tA=";
|
||||
hash = "sha256-ycThFJ+f6NOWI97KyqgMES2Y2ZZ1aBkggBe6Z50Vhjs=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
|
||||
hash = "sha256-cId3K8m+XRlYHD4NyjSEyFR6c4Yvk6UzGAkdHt0bQUs=";
|
||||
hash = "sha256-bE16GScBk9a32k49P9WuT4fymscdY2AyP9k29UsN8HY=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Ranger-like file navigation for zsh";
|
||||
homepage = "https://github.com/Vifon/deer";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.vyp ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
pkg-config,
|
||||
gtk3,
|
||||
libsoup_2_4,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -54,7 +53,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -74,6 +73,8 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}";
|
||||
description = "Free, open-source GTO solver for Texas hold'em poker";
|
||||
homepage = "https://github.com/b-inary/desktop-postflop";
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://www.impallari.com/dosis";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ cmfwyp ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDprintPlugin }:
|
||||
mkDprintPlugin {
|
||||
description = "Biome (JS/TS) wrapper plugin";
|
||||
hash = "sha256-czgTZXlW+LdTKGtX7JJtG7qAbnWlQpunMY92WiC+X8A=";
|
||||
hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys=";
|
||||
initConfig = {
|
||||
configExcludes = [ "**/node_modules" ];
|
||||
configKey = "biome";
|
||||
@@ -16,6 +16,6 @@ mkDprintPlugin {
|
||||
};
|
||||
pname = "dprint-plugin-biome";
|
||||
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
|
||||
url = "https://plugins.dprint.dev/biome-0.10.4.wasm";
|
||||
version = "0.10.4";
|
||||
url = "https://plugins.dprint.dev/biome-0.10.5.wasm";
|
||||
version = "0.10.5";
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.50";
|
||||
version = "1.0.51";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ntuFMxuCrA0meE8tOnA9oPLLvYfXyhQgebBuKELeDgQ=";
|
||||
hash = "sha256-9O6VRsO80d+ZvUbqt+AUqph9FXOWlwOdgJcqqiGBNC0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emmylua_doc_cli";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmmyLuaLs";
|
||||
repo = "emmylua-analyzer-rust";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
|
||||
hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/emmylua_doc_cli";
|
||||
|
||||
cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
|
||||
cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
openssl,
|
||||
libsoup_2_4,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
openssl
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-bad
|
||||
@@ -66,6 +66,8 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
description = "Ultimate Chess Toolkit";
|
||||
homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://github.com/impallari/Encode-Sans";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ cmfwyp ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackages,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
@@ -12,11 +13,9 @@
|
||||
libxslt,
|
||||
libusb-compat-0_1,
|
||||
sane-backends,
|
||||
rpm,
|
||||
cpio,
|
||||
getopt,
|
||||
autoPatchelfHook,
|
||||
gcc,
|
||||
epkowa,
|
||||
plugins ? epkowa.plugins,
|
||||
}:
|
||||
let
|
||||
common_meta = {
|
||||
@@ -25,492 +24,12 @@ let
|
||||
license = with lib.licenses; epson;
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
in
|
||||
############################
|
||||
#
|
||||
# PLUGINS
|
||||
#
|
||||
############################
|
||||
|
||||
# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
|
||||
let
|
||||
plugins = {
|
||||
v330 = stdenv.mkDerivation rec {
|
||||
name = "iscan-v330-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
# NOTE: Don't forget to update the webarchive link too!
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out{,/share,/lib}
|
||||
cp -r ./usr/share/{iscan-data,esci}/ $out/share/
|
||||
cp -r ./usr/lib64/esci $out/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
|
||||
'';
|
||||
hw = "Perfection V330 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v370 = stdenv.mkDerivation rec {
|
||||
name = "iscan-v370-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
|
||||
|
||||
mkdir -p $out/share $out/lib
|
||||
cp -r usr/share/{iscan-data,iscan}/ $out/share
|
||||
cp -r usr/lib64/iscan $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin"
|
||||
'';
|
||||
hw = "Perfection V37/V370";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v550 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-perfection-v550-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin"
|
||||
'';
|
||||
hw = "Perfection V550 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v600 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-x820-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
|
||||
'';
|
||||
hw = "Perfection V600 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan esci x820 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
x770 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-x770-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
|
||||
'';
|
||||
hw = "Perfection V500 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan esci x770 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
f720 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-f720-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ gcc.cc.lib ];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
|
||||
'';
|
||||
hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan esci f720 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s80 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-s80-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
gcc.cc.lib
|
||||
libtool
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
|
||||
'';
|
||||
hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan esci s80 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s600 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-s600-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin"
|
||||
'';
|
||||
hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan gt-s600 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s650 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-s650-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
|
||||
$registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
|
||||
'';
|
||||
hw = "GT-S650, Perfection V19, Perfection V39";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-S650 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
x750 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-x750-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin"
|
||||
'';
|
||||
hw = "GT-X750, Perfection 4490";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-X750 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
gt1500 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-1500-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin"
|
||||
'';
|
||||
hw = "GT-1500";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-1500 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
ds30 = stdenv.mkDerivation rec {
|
||||
name = "iscan-ds-30-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so"
|
||||
'';
|
||||
hw = "DS-30";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
network = stdenv.mkDerivation rec {
|
||||
pname = "iscan-nt-bundle";
|
||||
# for the version, look for the driver of XP-750 in the search page
|
||||
version = "2.30.4";
|
||||
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = "";
|
||||
hw = "network";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan network plugin";
|
||||
};
|
||||
};
|
||||
};
|
||||
plugins' = lib.attrsets.filterAttrs (_: lib.isDerivation) plugins;
|
||||
in
|
||||
let
|
||||
fwdir = symlinkJoin {
|
||||
name = "esci-firmware-dir";
|
||||
paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins;
|
||||
paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins';
|
||||
};
|
||||
in
|
||||
let
|
||||
@@ -588,7 +107,9 @@ stdenv.mkDerivation rec {
|
||||
echo "epkowa" > $out/etc/sane.d/dll.conf
|
||||
ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data
|
||||
mkdir -p $out/lib/iscan
|
||||
ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network
|
||||
''
|
||||
+ lib.optionalString (plugins' ? network) ''
|
||||
ln -s ${plugins'.network}/lib/iscan/network $out/lib/iscan/network
|
||||
'';
|
||||
postFixup = ''
|
||||
# iscan-registry is a shell script requiring getopt
|
||||
@@ -599,15 +120,26 @@ stdenv.mkDerivation rec {
|
||||
lib.mapAttrsToList (name: value: ''
|
||||
plugin=${value};
|
||||
${value.passthru.registrationCommand}
|
||||
'') plugins
|
||||
'') plugins'
|
||||
);
|
||||
|
||||
passthru.plugins = callPackages ./plugins.nix { inherit common_meta; };
|
||||
|
||||
meta = common_meta // {
|
||||
description = "sane-epkowa backend for some epson scanners";
|
||||
longDescription = ''
|
||||
Includes gui-less iscan (aka. Image Scan! for Linux).
|
||||
Supported hardware: at least :
|
||||
''
|
||||
+ lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
|
||||
+ lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins')
|
||||
+ ''
|
||||
It is possible to only use a subset of the plugins by overriding the `plugins` input:
|
||||
epkowa' = pkgs.epkowa.override {
|
||||
plugins = {
|
||||
inherit (pkgs.epkowa.plugins) x770; # Select correct plugins for your scanner here
|
||||
};
|
||||
};
|
||||
'';
|
||||
maintainers = with lib.maintainers; [
|
||||
symphorien
|
||||
dominikh
|
||||
|
||||
@@ -0,0 +1,485 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
rpm,
|
||||
cpio,
|
||||
gcc,
|
||||
libtool,
|
||||
common_meta,
|
||||
}:
|
||||
|
||||
# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
|
||||
{
|
||||
v330 = stdenv.mkDerivation rec {
|
||||
name = "iscan-v330-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
# NOTE: Don't forget to update the webarchive link too!
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out{,/share,/lib}
|
||||
cp -r ./usr/share/{iscan-data,esci}/ $out/share/
|
||||
cp -r ./usr/lib64/esci $out/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
|
||||
'';
|
||||
hw = "Perfection V330 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v370 = stdenv.mkDerivation rec {
|
||||
name = "iscan-v370-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
|
||||
|
||||
mkdir -p $out/share $out/lib
|
||||
cp -r usr/share/{iscan-data,iscan}/ $out/share
|
||||
cp -r usr/lib64/iscan $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin"
|
||||
'';
|
||||
hw = "Perfection V37/V370";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v550 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-perfection-v550-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin"
|
||||
'';
|
||||
hw = "Perfection V550 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
v600 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-x820-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
|
||||
'';
|
||||
hw = "Perfection V600 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan esci x820 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
x770 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-x770-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
|
||||
'';
|
||||
hw = "Perfection V500 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan esci x770 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
f720 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-f720-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ gcc.cc.lib ];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
|
||||
'';
|
||||
hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan esci f720 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s80 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-s80-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
gcc.cc.lib
|
||||
libtool
|
||||
];
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
|
||||
$registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
|
||||
'';
|
||||
hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan esci s80 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s600 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-s600-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin"
|
||||
'';
|
||||
hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan gt-s600 plugin for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
s650 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-s650-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
|
||||
$registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
|
||||
'';
|
||||
hw = "GT-S650, Perfection V19, Perfection V39";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-S650 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
x750 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-x750-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin"
|
||||
'';
|
||||
hw = "GT-X750, Perfection 4490";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-X750 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
gt1500 = stdenv.mkDerivation rec {
|
||||
name = "iscan-gt-1500-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin"
|
||||
'';
|
||||
hw = "GT-1500";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "iscan GT-1500 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
ds30 = stdenv.mkDerivation rec {
|
||||
name = "iscan-ds-30-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so"
|
||||
'';
|
||||
hw = "DS-30";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
network = stdenv.mkDerivation rec {
|
||||
pname = "iscan-nt-bundle";
|
||||
# for the version, look for the driver of XP-750 in the search page
|
||||
version = "2.30.4";
|
||||
|
||||
buildInputs = [ (lib.getLib stdenv.cc.cc) ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k";
|
||||
};
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
passthru = {
|
||||
registrationCommand = "";
|
||||
hw = "network";
|
||||
};
|
||||
|
||||
meta = common_meta // {
|
||||
description = "iscan network plugin";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# the Equicord repository. Dates as tags (and automatic releases) were the compromise
|
||||
# we came to with upstream. Please do not change the version schema (e.g., to semver)
|
||||
# unless upstream changes the tag schema from dates.
|
||||
version = "2025-10-12";
|
||||
version = "2025-10-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Equicord";
|
||||
repo = "Equicord";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-SH8zRLBmglsSFAg0kNmab2BV+Hx2ZCl/wd3KptUWezY=";
|
||||
hash = "sha256-OTndJGxnr7Laf7So0vmSP+8OuyFDVV4xXi8tkuSR3U0=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.53.0";
|
||||
version = "2.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Cq6Nq7UpeW7MFi6VjsWmU2M3FjzDiAyhwnl4yTQFRnA=";
|
||||
hash = "sha256-HU+OqaLuepx89lSBwOTJYS5nq8d19AhzAaUXwlpEhUc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -22,12 +22,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "filezilla";
|
||||
version = "3.68.1";
|
||||
version = "3.69.3";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
|
||||
rev = "11205";
|
||||
hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE=";
|
||||
rev = "11309";
|
||||
hash = "sha256-+wvdQnsYUsLS4pHoa3JVzkgTVxbeck/c7IaDt0VqU+8=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@@ -70,6 +70,9 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
maintainers = with maintainers; [
|
||||
pSub
|
||||
iedame
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-headless-client";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
tag = "headless-client-${version}";
|
||||
hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
|
||||
hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
|
||||
cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "headless-client";
|
||||
RUSTFLAGS = "--cfg system_certs";
|
||||
|
||||
@@ -4,36 +4,33 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
SDL2,
|
||||
sdl3,
|
||||
useSDL3 ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fna3d";
|
||||
version = "25.02";
|
||||
version = "25.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs=";
|
||||
hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw=";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SDL3" useSDL3)
|
||||
];
|
||||
buildInputs = if useSDL3 then [ sdl3 ] else [ SDL2 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 libFNA3D.so $out/lib/libFNA3D.so
|
||||
ln -s libFNA3D.so $out/lib/libFNA3D.so.0
|
||||
ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Accuracy-focused XNA4 reimplementation for open platforms";
|
||||
homepage = "https://fna-xna.github.io/";
|
||||
license = lib.licenses.mspl;
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fna3d";
|
||||
maintainers = with lib.maintainers; [ mrtnvgr ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
gtksourceview5,
|
||||
lcms2,
|
||||
libadwaita,
|
||||
libglycin,
|
||||
gst_all_1,
|
||||
desktop-file-utils,
|
||||
appstream-glib,
|
||||
@@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# We should eventually use a cargo vendor patch hook instead
|
||||
preConfigure = ''
|
||||
pushd ../$(stripHash $cargoDeps)/glycin-2.*
|
||||
patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
|
||||
patch -p3 < ${libglycin.passthru.glycinPathsPatch}
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "freifunk-meshviewer";
|
||||
|
||||
version = "12.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freifunk";
|
||||
repo = "meshviewer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-h+0f6RwJip3V7XJ8q8eEov2k09wNwdHOJgR2XUZqkgw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-QgUEoUF2qEtplx2YaMO81g9cY7a+oXCX5dF6V54waD8=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/freifunk-meshviewer/
|
||||
cp -r build/* $out/share/freifunk-meshviewer/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/freifunk/meshviewer";
|
||||
changelog = "https://github.com/freifunk/meshviewer/releases/tag/v${finalAttrs.version}";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
felixsinger
|
||||
];
|
||||
license = lib.licenses.agpl3Only;
|
||||
};
|
||||
})
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://www.nongnu.org/g-wrap/";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
libsoup_2_4,
|
||||
json-glib,
|
||||
sqlite,
|
||||
webkitgtk_4_0,
|
||||
# webkitgtk_4_0,
|
||||
libmanette,
|
||||
libXtst,
|
||||
wrapGAppsHook3,
|
||||
@@ -50,10 +50,12 @@ stdenv.mkDerivation rec {
|
||||
libsoup_2_4
|
||||
libXtst
|
||||
sqlite
|
||||
webkitgtk_4_0
|
||||
# webkitgtk_4_0
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
homepage = "https://tkashkin.github.io/projects/gamehub";
|
||||
description = "Unified library for all your games";
|
||||
longDescription = ''
|
||||
|
||||
+12
-9
@@ -4,10 +4,14 @@
|
||||
fetchurl,
|
||||
autoconf,
|
||||
automake,
|
||||
allegro,
|
||||
allegro4,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
allegro = allegro4;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "garden-of-coloured-lights";
|
||||
version = "1.0.9";
|
||||
|
||||
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";
|
||||
sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";
|
||||
url = "mirror://sourceforge/garden/${finalAttrs.version}/garden-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2vhzLCKaTMBPRgUUv/G6BRcfqtqeGVdccqUKkU8jUuM=";
|
||||
};
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
@@ -33,12 +37,11 @@ stdenv.mkDerivation rec {
|
||||
# `eclass'; eclass.o:src/eclass.c:21: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Old-school vertical shoot-em-up / bullet hell";
|
||||
mainProgram = "garden";
|
||||
homepage = "https://sourceforge.net/projects/garden/";
|
||||
maintainers = [ ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatus";
|
||||
version = "5.26.0";
|
||||
version = "5.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Aib8s1iHkUnp80MdDAgTleXLzOc2B3Z6rnhqffOIzg0=";
|
||||
hash = "sha256-fyubtcmAuH6ayHvfj0bYNrYu1Xs0q7mDO+G9SklWc7o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vm+M2U0EhRjBe7AgpPsukIynHTuvACA/NBL2cdUtKNw=";
|
||||
vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.linquize ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "gbdfed";
|
||||
};
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-XSDzvh8zjrmKOP7YXjXG5+3qCzGQEJp1+RmwmRd4oOs=";
|
||||
hash = "sha256-DO6IJbTESDnRtwHw0o+VkjjZiRBSynfPQ179qbNFBO0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-TkJyq6WyHTXoCvGSiV6w/IYoLCxAvbrS1oFdsgbfl5s=";
|
||||
hash = "sha256-Tmnl9TagqphoDSMKu0Ny3guJZgEkd8IvdxlmQ+s7378=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.5.242";
|
||||
version = "5.5.243";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
glm,
|
||||
gtest,
|
||||
tinycmmc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geomcpp";
|
||||
version = "0.0.0-unstable-2025-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Grumbel";
|
||||
repo = "geomcpp";
|
||||
rev = "282e3710fbe6dacee630391e4af8ffe03181f8a9";
|
||||
sha256 = "sha256-M4a6P6J/PBDklpOiR81Nah0STlXFI48+mQkNqMBicKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
gtest
|
||||
tinycmmc
|
||||
];
|
||||
propagatedBuildInputs = [ glm ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWARNINGS=ON"
|
||||
"-DWERROR=ON"
|
||||
"-DBUILD_TESTS=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
echo $version > VERSION
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Collection of point, size and rect classes";
|
||||
maintainers = [ lib.maintainers.SchweGELBin ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
})
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://gflags.github.io/gflags/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.linquize ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user