From 65d0fd98e616919bd7aeb16caa5b284f3d86ccb5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 21 Mar 2025 20:18:28 +0200 Subject: [PATCH] ocamlPackages.camlp5: remove spurious indentation --- .../tools/ocaml/camlp5/default.nix | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index afcaa4d183ee..c7a477e0cf23 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -17,81 +17,81 @@ if lib.versionOlder ocaml.version "4.02" then throw "camlp5 is not available for OCaml ${ocaml.version}" else - let - params = - if lib.versionAtLeast ocaml.version "4.12" && !legacy then - rec { - version = "8.03.01"; +let + params = + if lib.versionAtLeast ocaml.version "4.12" && !legacy then + rec { + version = "8.03.01"; - src = fetchFromGitHub { - owner = "camlp5"; - repo = "camlp5"; - rev = version; - hash = "sha256-GnNSCfnizazMT5kgib7u5PIb2kWsnqpL33RsPEK4JvM="; - }; - - nativeBuildInputs = [ - makeWrapper - ocaml - findlib - perl - ]; - buildInputs = [ - bos - re - rresult - ]; - propagatedBuildInputs = [ camlp-streams ]; - - } - else - rec { - version = "7.14"; - src = fetchFromGitHub { - owner = "camlp5"; - repo = "camlp5"; - rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; - }; - nativeBuildInputs = [ - ocaml - perl - ]; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + rev = version; + hash = "sha256-GnNSCfnizazMT5kgib7u5PIb2kWsnqpL33RsPEK4JvM="; }; - in - stdenv.mkDerivation ( - params - // { + nativeBuildInputs = [ + makeWrapper + ocaml + findlib + perl + ]; + buildInputs = [ + bos + re + rresult + ]; + propagatedBuildInputs = [ camlp-streams ]; - pname = "ocaml${ocaml.version}-camlp5"; - - strictDeps = true; - - prefixKey = "-prefix "; - - preConfigure = '' - configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) - patchShebangs ./config/find_stuffversion.pl etc/META.pl - ''; - - buildFlags = [ "world.opt" ]; - - dontStrip = true; - - meta = with lib; { - description = "Preprocessor-pretty-printer for OCaml"; - longDescription = '' - Camlp5 is a preprocessor and pretty-printer for OCaml programs. - It also provides parsing and printing tools. - ''; - homepage = "https://camlp5.github.io/"; - license = licenses.bsd3; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with maintainers; [ - maggesi - vbgl + } + else + rec { + version = "7.14"; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; + sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; + }; + nativeBuildInputs = [ + ocaml + perl ]; }; - } - ) +in + +stdenv.mkDerivation ( + params + // { + + pname = "ocaml${ocaml.version}-camlp5"; + + strictDeps = true; + + prefixKey = "-prefix "; + + preConfigure = '' + configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) + patchShebangs ./config/find_stuffversion.pl etc/META.pl + ''; + + buildFlags = [ "world.opt" ]; + + dontStrip = true; + + meta = with lib; { + description = "Preprocessor-pretty-printer for OCaml"; + longDescription = '' + Camlp5 is a preprocessor and pretty-printer for OCaml programs. + It also provides parsing and printing tools. + ''; + homepage = "https://camlp5.github.io/"; + license = licenses.bsd3; + platforms = ocaml.meta.platforms or [ ]; + maintainers = with maintainers; [ + maggesi + vbgl + ]; + }; + } +)