Merge pull request #186355 from marsam/update-opam

opam: 2.1.2 -> 2.1.3

1 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index b915cdb65ced..2108ba284040 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -15,8 +15,8 @@ let
       sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
     };
     "cppo" = fetchurl {
-      url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz";
-      sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv";
+      url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz";
+      sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by";
     };
     "cudf" = fetchurl {
       url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz";
@@ -27,8 +27,8 @@ let
       sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c";
     };
     "dune-local" = fetchurl {
-      url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz";
-      sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv";
+      url = "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz";
+      sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k";
     };
     "extlib" = fetchurl {
       url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz";
@@ -47,12 +47,12 @@ let
       sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr";
     };
     "opam-file-format" = fetchurl {
-      url = "https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz";
-      sha256 = "1bqyrlsvmjf4gqzmzbiyja9m1ph30ic9i18x23p5ziymyylw2sfg";
+      url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz";
+      sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02";
     };
     "re" = fetchurl {
-      url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz";
-      sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
+      url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz";
+      sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4";
     };
     "result" = fetchurl {
       url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz";
@@ -67,13 +67,13 @@ let
       sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
     };
     opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/2.1.2.zip";
-      sha256 = "0yq3dgx869016xrf65xv0glmqill1nk2ad12x3l36l70pn90rmyd";
+      url = "https://github.com/ocaml/opam/archive/2.1.3.zip";
+      sha256 = "08n72n5wc476p28ypxjs8fmlvcb42129fcva753gqm0xicqh24xf";
     };
   };
 in stdenv.mkDerivation {
   pname = "opam";
-  version = "2.1.2";
+  version = "2.1.3";
 
   nativeBuildInputs = [ makeWrapper unzip ];
   buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@@ -83,7 +83,7 @@ in stdenv.mkDerivation {
   postUnpack = ''
     ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz
     ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz
-    ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tbz
+    ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz
     ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz
     ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz
     ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz
@@ -133,4 +133,4 @@ in stdenv.mkDerivation {
     platforms = platforms.all;
   };
 }
-# Generated by: ./opam.nix.pl -v 2.1.2 -p opam-shebangs.patch
+# Generated by: ./opam.nix.pl -v 2.1.3 -p opam-shebangs.patch