Skip to content

Commit

Permalink
sile: 0.14.17 -> 0.15.5 (#353607)
Browse files Browse the repository at this point in the history
  • Loading branch information
doronbehar authored Nov 5, 2024
2 parents e3a7cda + 5a37bac commit 4aa3656
Show file tree
Hide file tree
Showing 3 changed files with 187 additions and 146 deletions.
187 changes: 187 additions & 0 deletions pkgs/by-name/si/sile/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
{
lib,
stdenv,
fetchzip,

# nativeBuildInputs
pkg-config,
jq,
cargo,
rustc,
rustPlatform,

# buildInputs
lua,
harfbuzz,
icu,
fontconfig,
libiconv,
stylua,
typos,
darwin,
# FONTCONFIG_FILE
makeFontsConf,
gentium,

# passthru.tests
runCommand,
poppler_utils,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "sile";
version = "0.15.5";

src = fetchzip {
url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.zip";
sha256 = "sha256-zP+MGCXGEg19U6tMrHIdgAAfKQT21vFtmoEROXgxUB0=";
};

cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
dontConfigure = true;
hash = "sha256-hmgDG29C5JfQX2acMr8c3lmswa1u5XHauRWFd4QGmOo=";
};

nativeBuildInputs = [
pkg-config
jq
cargo
rustc
rustPlatform.cargoSetupHook
];

buildInputs =
[
finalAttrs.finalPackage.passthru.luaEnv
harfbuzz
icu
fontconfig
libiconv
stylua
typos
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
];

configureFlags =
[
# Nix will supply all the Lua dependencies, so stop the build system from
# bundling vendored copies of them.
"--with-system-lua-sources"
"--with-system-luarocks"
# The automake check target uses pdfinfo to confirm the output of a test
# run, and uses autotools to discover it. This flake build eschews that
# test because it is run from the source directory but the binary is
# already built with system paths, so it can't be checked under Nix until
# after install. After install the Makefile isn't available of course, so
# we have our own copy of it with a hard coded path to `pdfinfo`. By
# specifying some binary here we skip the configure time test for
# `pdfinfo`, by using `false` we make sure that if it is expected during
# build time we would fail to build since we only provide it at test time.
"PDFINFO=false"
]
++ lib.optionals (!lua.pkgs.isLuaJIT) [
"--without-luajit"
];

outputs = [
"out"
"doc"
"man"
"dev"
];

# TODO: At some point, upstream should support installing the pre-built
# manual automatically
postInstall = ''
install -Dm0644 documentation/sile.pdf $out/share/doc/sile/manual.pdf
'';

FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [
gentium
];
};

enableParallelBuilding = true;

passthru = {
luaEnv = lua.withPackages (
ps:
with ps;
[
cassowary
cldr
fluent
linenoise
loadkit
lpeg
lua-zlib
lua_cliargs
luaepnf
luaexpat
luafilesystem
luarepl
luasec
luasocket
luautf8
penlight
vstruct
# lua packages needed for testing
busted
luacheck
# packages needed for building api docs
ldoc
# NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
]
++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
bit32
]
++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
compat53
]
);

# Copied from Makefile.am
tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (
runCommand "${finalAttrs.pname}-test"
{
nativeBuildInputs = [
poppler_utils
finalAttrs.finalPackage
];
inherit (finalAttrs) FONTCONFIG_FILE;
}
''
output=$(mktemp -t selfcheck-XXXXXX.pdf)
echo "<sile>foo</sile>" | sile -o $output -
pdfinfo $output | grep "SILE v${finalAttrs.version}" > $out
''
);
};

meta = {
description = "Typesetting system";
longDescription = ''
SILE is a typesetting system; its job is to produce beautiful
printed documents. Conceptually, SILE is similar to TeX—from
which it borrows some concepts and even syntax and
algorithms—but the similarities end there. Rather than being a
derivative of the TeX family SILE is a new typesetting and
layout engine written from the ground up using modern
technologies and borrowing some ideas from graphical systems
such as InDesign.
'';
homepage = "https://sile-typesetter.org";
changelog = "https://github.com/sile-typesetter/sile/raw/v${finalAttrs.version}/CHANGELOG.md";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
doronbehar
alerque
];
license = lib.licenses.mit;
mainProgram = "sile";
};
})
142 changes: 0 additions & 142 deletions pkgs/tools/typesetting/sile/default.nix

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12093,10 +12093,6 @@ with pkgs;

silc_server = callPackage ../servers/silc-server { };

sile = callPackage ../tools/typesetting/sile {
lua = lua5_3;
};

silenthound = callPackage ../tools/security/silenthound { };

silice = callPackage ../development/compilers/silice { };
Expand Down

0 comments on commit 4aa3656

Please sign in to comment.