From 3e7fa939f4cd9f5fd07769d99fd0b538e096ef65 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Jan 2019 10:02:38 +0100 Subject: [PATCH] sile: 0.9.4 -> 0.9.5 --- pkgs/tools/typesetting/sile/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 18ab2d1f9c7..609c782667e 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,5 +1,5 @@ { stdenv, darwin, fetchurl, makeWrapper, pkgconfig -, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem +, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec , fontconfig, lua, libiconv }: @@ -7,7 +7,7 @@ with stdenv.lib; let - libs = [lpeg luaexpat luazlib luafilesystem]; + libs = [ lpeg luaexpat luazlib luafilesystem luasocket luasec ]; getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; @@ -18,15 +18,16 @@ in stdenv.mkDerivation rec { name = "sile-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; + sha256 = "0m80rkbkma11xsr7bbrmq5mdwi5k79clsrmc75blbnsf9wqil8dp"; }; nativeBuildInputs = [pkgconfig makeWrapper]; - buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ] + buildInputs = [ harfbuzz icu lua fontconfig libiconv ] + ++ libs ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 246e6200dbc..676a570bcad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5432,7 +5432,7 @@ in silc_server = callPackage ../servers/silc-server { }; sile = callPackage ../tools/typesetting/sile { - inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg; + inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec; }; silver-searcher = callPackage ../tools/text/silver-searcher { };