public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53829 from vbgl/sile-0.9.5

Browse Source 
sile: 0.9.4 -> 0.9.5
This commit is contained in:
markuskowa 2019-01-12 13:01:28 +01:00 committed by GitHub
commit c5bb36f570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/typesetting/sile/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig { stdenv, darwin, fetchurl, makeWrapper, pkgconfig
, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem , harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem, luasocket, luasec
, fontconfig, lua, libiconv , fontconfig, lua, libiconv
}: }:
@ -7,7 +7,7 @@ with stdenv.lib;
let 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}"; getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
getLuaPath = lib : getPath lib "lua"; getLuaPath = lib : getPath lib "lua";
getLuaCPath = lib : getPath lib "so"; getLuaCPath = lib : getPath lib "so";
@ -18,15 +18,16 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sile-${version}"; name = "sile-${version}";
version = "0.9.4"; version = "0.9.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; sha256 = "0m80rkbkma11xsr7bbrmq5mdwi5k79clsrmc75blbnsf9wqil8dp";
}; };
nativeBuildInputs = [pkgconfig makeWrapper]; 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 ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
; ;

2
pkgs/top-level/all-packages.nix
View File

@ -5432,7 +5432,7 @@ in
silc_server = callPackage ../servers/silc-server { }; silc_server = callPackage ../servers/silc-server { };
sile = callPackage ../tools/typesetting/sile { 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 { }; silver-searcher = callPackage ../tools/text/silver-searcher { };