From e162d35f0467f76933505fd9487f8d7631d84a3c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 25 Nov 2024 17:31:58 +0100
Subject: [PATCH] =?UTF-8?q?opam:=202.2.0=20=E2=86=92=202.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/opam-core/default.nix       | 2 +-
 pkgs/development/ocaml-modules/opam-format/default.nix     | 2 +-
 pkgs/development/ocaml-modules/opam-repository/default.nix | 2 +-
 pkgs/development/ocaml-modules/opam-state/default.nix      | 2 +-
 pkgs/development/tools/ocaml/opam/default.nix              | 6 +++---
 pkgs/development/tools/ocaml/opam/installer.nix            | 5 +----
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/opam-core/default.nix b/pkgs/development/ocaml-modules/opam-core/default.nix
index 8f9c4bf37a31..0aa5f10f0674 100644
--- a/pkgs/development/ocaml-modules/opam-core/default.nix
+++ b/pkgs/development/ocaml-modules/opam-core/default.nix
@@ -2,7 +2,7 @@
 , jsonm, ocamlgraph, re, sha, swhid_core, uutf
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "opam-core";
 
   inherit (opam) src version;
diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix
index 00d0b146fb71..27b90a8556b4 100644
--- a/pkgs/development/ocaml-modules/opam-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-format/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage, opam-core, opam-file-format }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "opam-format";
 
   inherit (opam-core) src version;
diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix
index c23db8c79f0e..472bcc78f211 100644
--- a/pkgs/development/ocaml-modules/opam-repository/default.nix
+++ b/pkgs/development/ocaml-modules/opam-repository/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage, opam-format, curl }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "opam-repository";
 
   inherit (opam-format) src version;
diff --git a/pkgs/development/ocaml-modules/opam-state/default.nix b/pkgs/development/ocaml-modules/opam-state/default.nix
index a0f2332783d7..7481f04f3202 100644
--- a/pkgs/development/ocaml-modules/opam-state/default.nix
+++ b/pkgs/development/ocaml-modules/opam-state/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage, opam, opam-repository, spdx_licenses }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "opam-state";
 
   inherit (opam) src version;
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 4e7d0af89ab0..4818e72f047a 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -6,11 +6,11 @@ assert lib.versionAtLeast ocaml.version "4.08.0";
 
 stdenv.mkDerivation {
   pname = "opam";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
-    url = "https://github.com/ocaml/opam/releases/download/2.2.0/opam-full-2.2.0-2.tar.gz";
-    sha256 = "459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97";
+    url = "https://github.com/ocaml/opam/releases/download/2.3.0/opam-full-2.3.0.tar.gz";
+    hash = "sha256-UGunaGXcMVtn35qonnq9XBqJen8KkteyaUl0/cUys0Y=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix
index a96fd9d5f5ea..3e3685b8e2fe 100644
--- a/pkgs/development/tools/ocaml/opam/installer.nix
+++ b/pkgs/development/tools/ocaml/opam/installer.nix
@@ -1,12 +1,9 @@
-{ unzip, opam, ocamlPackages }:
+{ opam, ocamlPackages }:
 
 ocamlPackages.buildDunePackage {
   pname = "opam-installer";
 
-  duneVersion = "3";
-
   inherit (opam) version src;
-  nativeBuildInputs = [ unzip ];
 
   configureFlags = [ "--disable-checks" "--prefix=$out" ];
   buildInputs = with ocamlPackages; [ opam-format cmdliner ];