diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/ocaml')
7 files changed, 97 insertions, 110 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index 7e7c185fbc7a..5fb76a526016 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.12"; + name = "camlp5-7.13"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz"; - sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf"; + url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz"; + sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp"; }; buildInputs = [ ocaml ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index e7528d4f7728..483e9c45df01 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchurl, ocamlPackages }: -stdenv.mkDerivation rec { +ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.4.0"; - src = fetchFromGitHub { - owner = "lelio-brun"; - repo = "obelisk"; - rev = "v${version}"; - sha256 = "0rw85knbwqj2rys1hh5qy8sfdqb4mb1wsriy38n7zcpbwim47vb8"; + version = "0.5.2"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; + sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir ]; - - installFlags = [ "BINDIR=$(out)/bin" ]; + buildInputs = with ocamlPackages; [ menhir re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocamlPackages.ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/Lelio-Brun/Obelisk"; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 5b607d3d6c64..1de95187af2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,115 +1,43 @@ -{ lib, fetchurl, fetchzip, ocamlPackages }: +{ lib, fetchurl, fetchzip, callPackage }: -with ocamlPackages; - -let - mkOCamlformat = { - version, - sha256, - buildInputs, - useDune2 ? true, - tarballName ? "ocamlformat-${version}.tbz", - # The 'src' argument can be removed when 0.11.0 is pruned - src ? fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; - inherit sha256; - } - }: - buildDunePackage rec { - pname = "ocamlformat"; - - minimumOCamlVersion = "4.06"; - - inherit src version useDune2 buildInputs; - - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; - }; - }; - - post_0_11_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - ]; - - post_0_14_buildInputs = [ - base - cmdliner - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - fix - menhir - ]; -in +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_11_0 = mkOCamlformat rec { + ocamlformat_0_11_0 = mkOCamlformat { version = "0.11.0"; - src = fetchzip { - url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; - inherit sha256; - }; - sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_12 = mkOCamlformat { version = "0.12"; - sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_13_0 = mkOCamlformat rec { version = "0.13.0"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; tarballName = "ocamlformat-${version}-2.tbz"; - useDune2 = false; - buildInputs = post_0_11_buildInputs; }; ocamlformat_0_14_0 = mkOCamlformat { version = "0.14.0"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_1 = mkOCamlformat { version = "0.14.1"; - sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; - buildInputs = post_0_14_buildInputs; }; ocamlformat_0_14_2 = mkOCamlformat { version = "0.14.2"; - sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; - buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_3 = mkOCamlformat { + version = "0.14.3"; }; ocamlformat_0_15_0 = mkOCamlformat { version = "0.15.0"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - buildInputs = post_0_14_buildInputs; }; ocamlformat = ocamlformat_0_15_0; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix new file mode 100644 index 000000000000..c39ade7c0745 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -0,0 +1,68 @@ +{ lib, fetchurl, fetchzip, ocamlPackages +, version +, tarballName ? "ocamlformat-${version}.tbz", +}: + +let src = + if version == "0.11.0" + then fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + } else fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + sha256 = { + "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; + "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + }."${version}"; + } +; in + +with ocamlPackages; + +buildDunePackage rec { + pname = "ocamlformat"; + inherit src version; + + minimumOCamlVersion = "4.06"; + + useDune2 = lib.versionAtLeast version "0.14"; + + buildInputs = + if lib.versionAtLeast version "0.14" + then [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + fix + menhir + ] else [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index 42faa33fbe1c..9b06a55f07d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 46a87dc3ffed..49342d7b8485 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index 4ebea6766211..57db51612245 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: let - version = "1.99.19-beta"; + version = "1.99.21"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; + name = "ocaml${ocaml.version}-ocp-build-${version}-beta"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-build"; - rev = version; - sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; + rev = "v${version}"; + sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch"; - sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn"; - }); - - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib cmdliner re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' |