git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80081 from marsam/update-satysfi

satysfi: 0.0.3 -> 0.0.4

commit11cf0b21b7180668e462f3fff0a92814e70786c2 authorMario Rodas <marsam@users.noreply.github.com> dateWed 19 Feb 2020, 19:10 (7 years ago) parentde56cc5ef44aa0
1 file changed+18−8
pkgs/tools/typesetting/satysfi/default.nix+18−8
pkgs/tools/typesetting/satysfi/default.nix+18−8
@@ -15,27 +15,35 @@ let
1515 src = fetchFromGitHub {
1616 owner = "gfngfn";
1717 repo = "camlpdf";
18− rev = "v2.2.1+satysfi";
19− sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy";
18+ rev = "v2.2.2+satysfi";
19+ sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k";
2020 };
2121 });
2222 otfm = ocamlPackages.otfm.overrideAttrs (o: {
2323 src = fetchFromGitHub {
2424 owner = "gfngfn";
2525 repo = "otfm";
26− rev = "v0.3.2+satysfi";
27− sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd";
26+ rev = "v0.3.7+satysfi";
27+ sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";
28+ };
29+ });
30+ yojson = ocamlPackages.yojson.overrideAttrs (o: {
31+ src = fetchFromGitHub {
32+ owner = "gfngfn";
33+ repo = "yojson";
34+ rev = "v1.4.1+satysfi";
35+ sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp";
2836 };
2937 });
3038in
3139 stdenv.mkDerivation rec {
3240 pname = "satysfi";
33− version = "0.0.3";
41+ version = "0.0.4";
3442 src = fetchFromGitHub {
3543 owner = "gfngfn";
3644 repo = "SATySFi";
3745 rev = "v${version}";
38− sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f";
46+ sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv";
3947 fetchSubmodules = true;
4048 };
4149
@@ -49,7 +57,7 @@ in
4957
5058 buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
5159 ocaml findlib menhir
52− batteries camlimages core_kernel ppx_deriving uutf yojson
60+ batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re
5361 ]);
5462
5563 installPhase = ''
@@ -58,13 +66,15 @@ in
5866 cp -r ${lm}/* lib-satysfi/dist/fonts/
5967 cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
6068 make install PREFIX=$out LIBDIR=$out/share/satysfi
69+ mkdir -p $out/share/satysfi/
70+ cp -r lib-satysfi/dist/ $out/share/satysfi/
6171 '';
6272
6373 meta = with stdenv.lib; {
6474 homepage = https://github.com/gfngfn/SATySFi;
6575 description = "A statically-typed, functional typesetting system";
6676 license = licenses.lgpl3;
67− maintainers = [ maintainers.mt-caret ];
77+ maintainers = [ maintainers.mt-caret maintainers.marsam ];
6878 platforms = platforms.all;
6979 };
7080 }