diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-03-11 08:12:25 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-03-11 16:11:08 +0100 |
| commit | 7163b67543c8b7144356dbfe2705335cf0c1edf6 (patch) | |
| tree | dec1ce568d2842e6e2ef89d703fcc5d5846ea504 | |
| parent | 1d5b39880f46424b4f08639b843d16c3230780d6 (diff) | |
| download | nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar.gz nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar.bz2 nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar.lz nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar.xz nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.tar.zst nixlib-7163b67543c8b7144356dbfe2705335cf0c1edf6.zip | |
reason: 3.7.0 → 3.8.0
| -rw-r--r-- | pkgs/development/compilers/reason/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 4404a5108286..cc99aa078f9a 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,19 +1,14 @@ -{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2 , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: -lib.throwIfNot (lib.versionOlder ocaml.version "4.13") - "reason is not available for OCaml ${ocaml.version}" - stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "reason"; - rev = "daa11255cb4716ce1c370925251021bd6e3bd974"; - sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; + src = fetchurl { + url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; + sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l"; }; nativeBuildInputs = [ @@ -42,11 +37,13 @@ stdenv.mkDerivation rec { buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed installPhase = '' + runHook preInstall dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfccdbd0fcb5..967ff3a77101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14078,7 +14078,7 @@ with pkgs; regina = callPackage ../development/interpreters/regina { }; - inherit (ocaml-ng.ocamlPackages_4_12) reason; + inherit (ocamlPackages) reason; pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; |