From 5b70dbe789b632ba14adfb42859c3c5c579b7340 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Mar 2023 04:20:00 +0000 Subject: [PATCH 1/4] ocamlPackages.csexp: 1.5.1 -> 1.5.2 https://github.com/ocaml-dune/csexp/releases/tag/1.5.2 --- pkgs/development/ocaml-modules/csexp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 664d9a773ab0..1144a8b652b2 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -2,15 +2,14 @@ buildDunePackage rec { pname = "csexp"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; - sha256 = "sha256-1gXkBl+pCliABEDvLzOi2TE5i/LCIGGorLffhFwKrAI="; + hash = "sha256-GhTdBLtDeaQZkCSFUGKMd5E6nAfzw1wTcLaWDml3h/8="; }; - minimumOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ result From b947c0575ab3c07b64ed052df5332d4ab3ac2741 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Mar 2023 10:45:00 -0500 Subject: [PATCH 2/4] ocamlPackages.csexp: remove result from dependencies `result` was removed from dependencies in csexp 1.5.1 --- pkgs/development/ocaml-modules/csexp/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 1144a8b652b2..4b0df7e1f31c 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, result }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "csexp"; @@ -11,10 +11,6 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; - propagatedBuildInputs = [ - result - ]; - meta = with lib; { homepage = "https://github.com/ocaml-dune/csexp/"; description = "Minimal support for Canonical S-expressions"; From 3a4ba9e8ea7eb26e68adae559aadb13f76d7ad77 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 26 Mar 2023 04:20:00 +0000 Subject: [PATCH 3/4] ocamlPackages.csexp: add changelog to meta --- pkgs/development/ocaml-modules/csexp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 4b0df7e1f31c..4f72a3c09544 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -12,8 +12,9 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; meta = with lib; { - homepage = "https://github.com/ocaml-dune/csexp/"; description = "Minimal support for Canonical S-expressions"; + homepage = "https://github.com/ocaml-dune/csexp"; + changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; From 8d02422093330569723b92dbad086f803b2f081a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 26 Mar 2023 04:20:00 +0000 Subject: [PATCH 4/4] ocamlPackages.csexp: add liquidsoap as reverse dependency to passthru.tests --- pkgs/development/ocaml-modules/csexp/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 4f72a3c09544..e81962780751 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, liquidsoap }: buildDunePackage rec { pname = "csexp"; @@ -11,6 +11,10 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; + passthru.tests = { + inherit liquidsoap; + }; + meta = with lib; { description = "Minimal support for Canonical S-expressions"; homepage = "https://github.com/ocaml-dune/csexp";