about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJules Aguillon <jules@j3s.fr>2023-07-19 14:31:12 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2023-07-19 16:57:37 +0200
commit984a19f393afe3bf52c9d06083d00a1253210b1e (patch)
tree45d21a282787e14a12aecece084e8305e66f517e
parent0665253b864c4b725c19337b2b1971158f55b16f (diff)
ocamlformat: 0.25.1 -> 0.26.0
As always, the previous version is retained. The "preferred" version is
bumped.
-rw-r--r--pkgs/development/ocaml-modules/ocamlformat/generic.nix1
-rw-r--r--pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix2
-rw-r--r--pkgs/top-level/all-packages.nix3
-rw-r--r--pkgs/top-level/ocaml-packages.nix1
4 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
index 0e998af86ff74..215c0268562b6 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
@@ -22,6 +22,7 @@ rec {
       "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM=";
       "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4=";
       "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0=";
+      "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30=";
     }."${version}";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index 275c20dea8659..9b5b59ffae059 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -1,5 +1,5 @@
 { lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir
-, version ? "0.25.1" }:
+, version ? "0.26.0" }:
 
 let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c1ccdd07ce28..53dff109e81ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16467,7 +16467,8 @@ with pkgs;
   inherit (ocamlPackages)
     ocamlformat # latest version
     ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
-    ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1;
+    ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1
+    ocamlformat_0_26_0;
 
   orc = callPackage ../development/compilers/orc { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9b6d183f51804..85c79981cc00c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1181,6 +1181,7 @@ let
     ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; };
     ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; };
     ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; };
+    ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; };
 
     ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {};