From cc457c5912ffe25e658ea0e232f57a493b43b6d4 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 25 Aug 2022 17:04:14 +0200 Subject: [PATCH] ocamlformat_0_24_1: added It is identical to 0.24.0 in dependency. Speaking of 0.24.0, it wasn't actually released into Opam so I also removed it from all-packages.nix. It's still available through override. --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 2 +- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index a92fafeac4ac..f90eaca5273c 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -11,7 +11,7 @@ rec { ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; - ocamlformat_0_24_0 = ocamlformat.override { version = "0.24.0"; }; + ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; ocamlformat = callPackage ./generic.nix {}; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index a27672fcd7f3..325ab8227b72 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchzip, ocaml-ng -, version ? "0.24.0" +, version ? "0.24.1" , tarballName ? "ocamlformat-${version}.tbz", }: @@ -14,6 +14,7 @@ let src = "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; + "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; }."${version}"; }; ocamlPackages = ocaml-ng.ocamlPackages; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 087d384479b7..ee18ac8d60ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14209,7 +14209,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) 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_0; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1; orc = callPackage ../development/compilers/orc { };