MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #77738 from alerque/sile-v0.10.0

Browse source 
sile: v0.9.5.1 -> v0.10.3; adjust build process
This commit is contained in:
Mario Rodas 2020-02-12 08:30:48 -05:00 committed by GitHub
commit 802ad5fbbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/luarocks-packages.csv
View file

@ -6,8 +6,10 @@ basexx,,,,,
binaryheap,,,,,vcunat
bit32,,,,lua5_1,lblasc
busted,,,,,
cassowary,,,,,marsam
cjson,lua-cjson,,,,
compat53,,,,,vcunat
cosmo,,,,,marsam
coxpcall,,,1.17.0-1,,
cqueues,,,,,vcunat
cyrussasl,,,,,vcunat

1 # nix name luarocks name server version luaversion maintainers
6 binaryheap vcunat
7 bit32 lua5_1 lblasc
8 busted
9 cassowary marsam
10 cjson lua-cjson
11 compat53 vcunat
12 cosmo marsam
13 coxpcall 1.17.0-1
14 cqueues vcunat
15 cyrussasl vcunat

34
pkgs/development/lua-modules/generated-packages.nix
View file

@ -158,6 +158,23 @@ busted = buildLuarocksPackage {
};
};
};
cassowary = buildLuarocksPackage {
pname = "cassowary";
version = "2.2-1";
src = fetchurl {
url = mirror://luarocks/cassowary-2.2-1.src.rock;
sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy";
};
propagatedBuildInputs = [ lua penlight ];
meta = with stdenv.lib; {
homepage = "https://github.com/simoncozens/cassowary.lua";
description = "The cassowary constraint solver.";
maintainers = with maintainers; [ marsam ];
license.fullName = "Apache 2";
};
};
cjson = buildLuarocksPackage {
pname = "lua-cjson";
version = "2.1.0.6-1";
@ -197,6 +214,23 @@ compat53 = buildLuarocksPackage {
};
};
};
cosmo = buildLuarocksPackage {
pname = "cosmo";
version = "16.06.04-1";
src = fetchurl {
url = mirror://luarocks/cosmo-16.06.04-1.src.rock;
sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww";
};
propagatedBuildInputs = [ lpeg ];
meta = with stdenv.lib; {
homepage = "http://cosmo.luaforge.net";
description = "Safe templates for Lua";
maintainers = with maintainers; [ marsam ];
license.fullName = "MIT/X11";
};
};
coxpcall = buildLuarocksPackage {
pname = "coxpcall";
version = "1.17.0-1";

33
pkgs/tools/typesetting/sile/default.nix
View file

@ -1,26 +1,28 @@
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig, autoconf, automake
, harfbuzz, icu
, fontconfig, lua, libiconv
, makeFontsConf, gentium, gentium-book-basic, dejavu_fonts
, makeFontsConf, gentium
}:
with stdenv.lib;
let
luaEnv = lua.withPackages(ps: with ps;[ lpeg luaexpat lua-zlib luafilesystem luasocket luasec]);
luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo compat53 linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.9.5.1";
version = "0.10.3";
src = fetchurl {
url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0";
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856";
};
nativeBuildInputs = [pkgconfig makeWrapper];
configureFlags = [ "--with-system-luarocks" ];
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ]
++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
;
@ -34,23 +36,26 @@ stdenv.mkDerivation rec {
FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [
gentium
gentium-book-basic
dejavu_fonts
];
};
doCheck = stdenv.targetPlatform == stdenv.hostPlatform
# TODO: needs to tweak Makefile-fonts to avoid download fonts
doCheck = false; /*stdenv.targetPlatform == stdenv.hostPlatform
&& ! stdenv.isAarch64 # random seg. faults
&& ! stdenv.isDarwin; # dy lib not found
*/
enableParallelBuilding = true;
checkPhase = ''
make documentation/developers.pdf documentation/sile.pdf
preBuild = stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace libtexpdf/dpxutil.c \
--replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
'';
checkTarget = "examples";
postInstall = ''
install -D -t $out/share/doc/sile documentation/*.pdf
install -D -t $out/share/doc/sile documentation/sile.pdf
'';
# Hack to avoid TMPDIR in RPATHs.
@ -70,7 +75,7 @@ stdenv.mkDerivation rec {
technologies and borrowing some ideas from graphical systems
such as InDesign.
'';
homepage = http://www.sile-typesetter.org;
homepage = "https://sile-typesetter.org/";
platforms = platforms.unix;
license = licenses.mit;
};