From 0b2a15fdddd0494b2bfebef80d975bdd6eeb351f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Feb 2020 00:00:00 -0500 Subject: [PATCH 1/7] luaPackages.cassowary: init at 2.2-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 01e3150ede1..62f9fa722d9 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,6 +6,7 @@ basexx,,,,, binaryheap,,,,,vcunat bit32,,,,lua5_1,lblasc busted,,,,, +cassowary,,,,,marsam cjson,lua-cjson,,,, compat53,,,,,vcunat coxpcall,,,1.17.0-1,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d95ce128b73..1090123416e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -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"; From 7d64380b6b032323e6bd1378d599410f73f1c409 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Feb 2020 00:01:00 -0500 Subject: [PATCH 2/7] luaPackages.cosmo: init at 16.06.04-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 62f9fa722d9..cb934ae3752 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -9,6 +9,7 @@ busted,,,,, cassowary,,,,,marsam cjson,lua-cjson,,,, compat53,,,,,vcunat +cosmo,,,,,marsam coxpcall,,,1.17.0-1,, cqueues,,,,,vcunat cyrussasl,,,,,vcunat diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1090123416e..58af59c1971 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -214,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"; From cceb24e5a178bdf29c43ea50c961201d02e71ce4 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Wed, 15 Jan 2020 11:33:31 +0300 Subject: [PATCH 3/7] sile: v0.9.5.1 -> v0.10.0, adjust build process --- pkgs/tools/typesetting/sile/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 3b6ec809869..6fbebcefae9 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,23 +1,23 @@ { stdenv, darwin, fetchurl, makeWrapper, pkgconfig , 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 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.0"; 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 = "b0353b88793d68bf3e800f87bff51e8161ce39d250e22dff11385712caf332b6"; }; nativeBuildInputs = [pkgconfig makeWrapper]; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ gentium - gentium-book-basic - dejavu_fonts ]; }; @@ -46,11 +44,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; checkPhase = '' - make documentation/developers.pdf documentation/sile.pdf + make documentation examples ''; postInstall = '' - install -D -t $out/share/doc/sile documentation/*.pdf + install -D -t $out/share/doc/sile documentation/sile.pdf + install -D -t $out/share/doc/sile examples ''; # Hack to avoid TMPDIR in RPATHs. From df44e2e2b3a0d2884dbf981b4c11eef75b8689ec Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 24 Jan 2020 23:57:43 +0300 Subject: [PATCH 4/7] =?UTF-8?q?sile:=20v0.10.0=20=E2=86=92=20v0.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 6fbebcefae9..354f3c48244 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "b0353b88793d68bf3e800f87bff51e8161ce39d250e22dff11385712caf332b6"; + sha256 = "a5ec924bfe8a629ec4b4d09754d822cab1cf48d28bc6ce649faa5c597a108666"; }; nativeBuildInputs = [pkgconfig makeWrapper]; From 870e509ef7ca897884cde0c705f73da68bc1f260 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 24 Jan 2020 23:57:43 +0300 Subject: [PATCH 5/7] sile: note manual comes precompiled in tarball --- pkgs/tools/typesetting/sile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 354f3c48244..fddf8020d3b 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; checkPhase = '' - make documentation examples + make examples ''; postInstall = '' From 928e6486aab41815aa03cf78574beea383ceb951 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Wed, 5 Feb 2020 11:57:54 +0300 Subject: [PATCH 6/7] sile: Bump to 0.10.3 and add missing lua dependency --- pkgs/tools/typesetting/sile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index fddf8020d3b..de82656dc30 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -7,17 +7,17 @@ with stdenv.lib; let - luaEnv = lua.withPackages(ps: with ps;[cassowary linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]); + luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]); in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "a5ec924bfe8a629ec4b4d09754d822cab1cf48d28bc6ce649faa5c597a108666"; + sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856"; }; nativeBuildInputs = [pkgconfig makeWrapper]; From 984256e05c9c1ede509f85753e1397aaa58fd8c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 11 Feb 2020 00:02:00 -0500 Subject: [PATCH 7/7] sile: fix build --- pkgs/tools/typesetting/sile/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index de82656dc30..5bb4c5b7fb2 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig +{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig, autoconf, automake , harfbuzz, icu , fontconfig, lua, libiconv , makeFontsConf, gentium @@ -7,7 +7,7 @@ with stdenv.lib; let - luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]); + luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo compat53 linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]); in @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { 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 ; @@ -37,19 +39,23 @@ stdenv.mkDerivation rec { ]; }; - 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 examples + 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/sile.pdf - install -D -t $out/share/doc/sile examples ''; # Hack to avoid TMPDIR in RPATHs. @@ -69,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; };