diff options
| author | Jules Aguillon <jules@j3s.fr> | 2022-07-19 11:08:25 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-07-26 13:33:49 +0200 |
| commit | 98db578afa81422e1fecafbd76195a384fb17989 (patch) | |
| tree | c845ceb8ae26b3c90ee7fe9fd354d29ddd7290d2 | |
| parent | 1afb55692d3c5523c4524c0b694c0e535bd22a23 (diff) | |
| download | nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar.gz nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar.bz2 nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar.lz nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar.xz nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.tar.zst nixpkgs-98db578afa81422e1fecafbd76195a384fb17989.zip | |
ocamlformat: Support the version override
Rewrite the OCamlformat declaration to support overriding the 'version' argument.
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/generic.nix | 2 |
2 files changed, 10 insertions, 32 deletions
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 1a6a9ba7775..a92fafeac4a 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,39 +1,17 @@ { lib, fetchurl, fetchzip, callPackage }: -let mkOCamlformat = callPackage ./generic.nix; in - # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_19_0 = mkOCamlformat { - version = "0.19.0"; - }; - - ocamlformat_0_20_0 = mkOCamlformat { - version = "0.20.0"; - }; - - ocamlformat_0_20_1 = mkOCamlformat { - version = "0.20.1"; - }; - - ocamlformat_0_21_0 = mkOCamlformat { - version = "0.21.0"; - }; - - ocamlformat_0_22_4 = mkOCamlformat { - version = "0.22.4"; - }; - - ocamlformat_0_23_0 = mkOCamlformat { - version = "0.23.0"; - }; - - ocamlformat_0_24_0 = mkOCamlformat { - version = "0.24.0"; - }; - - ocamlformat = ocamlformat_0_24_0; + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; + 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 = callPackage ./generic.nix {}; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 0f6433c0e6a..a27672fcd7f 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 +, version ? "0.24.0" , tarballName ? "ocamlformat-${version}.tbz", }: |