diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-27 12:01:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-27 12:01:37 +0000 |
commit | 6626399ea9f2520ce9259e097b8a713de565a1f5 (patch) | |
tree | da2cf0728410b1c0de955fa7d4dc5b4590c5446b /pkgs/applications/misc/stog/default.nix | |
parent | 8041851753b2dfeb52234bfe6343392d66fdebfd (diff) | |
parent | 81ae4e07a370cacc200c95857e96ec3279f48411 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/misc/stog/default.nix')
-rw-r--r-- | pkgs/applications/misc/stog/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index c840bbfe5b845..17affeb3bbf65 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitLab, ocaml +{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml , fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx , dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: @@ -10,7 +10,6 @@ else buildDunePackage rec { pname = "stog"; version = "0.20.0"; - duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; @@ -20,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; + # Compatibility with higlo 0.9 + patches = fetchpatch { + url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch"; + hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc="; + }; + nativeBuildInputs = [ menhir ]; buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ |