Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ce032f79b2a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0905a5d99031
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 13, 2020

  1. ocamlPackages.vg: 0.9.3 → 0.9.4

    @vbgl
    vbgl committed Jun 13, 2020
    Copy the full SHA
    0905a5d View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/ocaml-modules/vg/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/ocaml-modules/vg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
, uchar, result, gg, uutf, otfm
, js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx,
, js_of_ocaml, js_of_ocaml-ppx,
pdfBackend ? true, # depends on uutf and otfm
htmlcBackend ? true # depends on js_of_ocaml
}:
@@ -11,7 +11,7 @@ let
inherit (stdenv.lib) optionals versionAtLeast;

pname = "vg";
version = "0.9.3";
version = "0.9.4";
webpage = "https://erratique.ch/software/${pname}";
in

@@ -25,14 +25,14 @@ stdenv.mkDerivation {

src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "0jj5hrqxdb6yyplnz0r7am4mbjzgcn876qp7sqs2x93a97fk6lwd";
sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak";
};

buildInputs = [ ocaml findlib ocamlbuild topkg ];

propagatedBuildInputs = [ uchar result gg ]
++ optionals pdfBackend [ uutf otfm ]
++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ];
++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ];

buildPhase = topkg.buildPhase
+ " --with-uutf ${boolToString pdfBackend}"