From b56f06f3e8c6f48973a43765f4b02c756ba30da4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 25 Sep 2023 07:14:12 +0200
Subject: ocamlPackages.camomile: 1.0.2 → 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/audio/liquidsoap/full.nix        | 2 +-
 pkgs/tools/typesetting/soupault/default.nix | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 81157c13782e8..5e196a5b557bc 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     ocamlPackages.mm
     ocamlPackages.ocaml_pcre
     ocamlPackages.menhir ocamlPackages.menhirLib
-    ocamlPackages.camomile
+    (ocamlPackages.camomile.override { version = "1.0.2"; })
     ocamlPackages.ocurl
     ocamlPackages.uri
     ocamlPackages.sedlex
diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix
index e2b69cc7b86bc..da3b2b509b1ec 100644
--- a/pkgs/tools/typesetting/soupault/default.nix
+++ b/pkgs/tools/typesetting/soupault/default.nix
@@ -1,6 +1,5 @@
 { lib
 , fetchFromGitea
-, fetchpatch
 , ocamlPackages
 , soupault
 , testers
@@ -24,14 +23,6 @@ ocamlPackages.buildDunePackage {
     sha256 = "nwXyOwDUbkMnyHPrvCvmToyONdbg5kJm2mt5rWrB6HA=";
   };
 
-  patches = lib.lists.optional
-    (lib.strings.versionAtLeast "2.0.0" ocamlPackages.camomile.version)
-    (fetchpatch {
-      name = "camomile-1_x";
-      url = "https://files.baturin.org/software/soupault/soupault-4.7.0-camomile-1.x.patch";
-      sha256 = "V7+OUjXqWtXwjUa35MlY9iyAlqOkst9Th7DgfDXkXZg=";
-    });
-
   buildInputs = with ocamlPackages; [
     base64
     camomile
-- 
cgit 1.4.1