From 7ed0a6f85f4f86acd0fde7ba91f7cea4b9d7c0a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 9 Aug 2022 17:13:21 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.graphql:=200.13.0=20=E2=86=92=200?= =?UTF-8?q?.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.irmin-graphql: mark as broken --- pkgs/development/ocaml-modules/graphql/default.nix | 2 +- pkgs/development/ocaml-modules/graphql/lwt.nix | 2 +- pkgs/development/ocaml-modules/graphql/parser.nix | 12 +++++------- pkgs/development/ocaml-modules/irmin/graphql.nix | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index f3adfdc87a9d..5bf61789e83a 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql"; - inherit (graphql_parser) version useDune2 src; + inherit (graphql_parser) version src; propagatedBuildInputs = [ graphql_parser rresult yojson ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 187856da0d61..8fd6abfb8fb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql-lwt"; - inherit (graphql) version useDune2 src; + inherit (graphql) version src; propagatedBuildInputs = [ graphql ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index 62f8ca1ef129..feea74f67807 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -1,16 +1,14 @@ -{ lib, buildDunePackage, fetchurl, alcotest, fmt, menhir, re }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt, menhir, re }: buildDunePackage rec { pname = "graphql_parser"; - version = "0.13.0"; + version = "0.14.0"; - useDune2 = true; - - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; - sha256 = "0gb5y99ph0nz5y3pc1gxq1py4wji2hyf2ydbp0hv23v00n50hpsm"; + sha256 = "sha256-v4v1ueF+NV7LvYIVinaf4rE450Z1P9OiMAito6/NHAY="; }; nativeBuildInputs = [ menhir ]; @@ -18,7 +16,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/andreas/ocaml-graphql-server"; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 03c8f1eca291..3074cfd368e1 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -24,6 +24,7 @@ buildDunePackage rec { meta = irmin.meta // { description = "GraphQL server for Irmin"; + broken = true; # Not compatible with graphql 0.14 }; }