diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-09-20 07:25:19 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-09-27 10:43:07 +0200 |
| commit | 0f96276d781caa3ae8d9753018ae5bcea6f9a8d0 (patch) | |
| tree | 812833f00643f7ee7f5da5506cf685ef52ccd4ef | |
| parent | 42c4d51f912245d3c4c3efde02ee4ec5fb17babf (diff) | |
| download | nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar.gz nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar.bz2 nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar.lz nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar.xz nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.tar.zst nixpkgs-0f96276d781caa3ae8d9753018ae5bcea6f9a8d0.zip | |
ocamlPackages.higlo: 0.8 → 0.9
| -rw-r--r-- | pkgs/applications/misc/stog/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/higlo/default.nix | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index c840bbfe5b8..17affeb3bbf 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 = [ diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index da843fe1511..fba8e35fb5b 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "higlo"; - version = "0.8"; - duneVersion = "3"; + version = "0.9"; + src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; rev = version; - sha256 = "sha256:09hsbwy5asacgh4gdj0vjpy4kzfnq3qji9szbsbyswsf1nbyczir"; + hash = "sha256-SaFFzp4FCjVLdMLH6mNIv3HzJbkXJ5Ojbku258LCfLI="; }; propagatedBuildInputs = [ sedlex xtmpl ]; |