diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index d084889dcac9..748869ea63c5 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2022.11.19"; + version = "2023.02.01"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q="; + hash = "sha256-sLhbIGF7j1tH8zKsPq1qOSwHvYDrVCyfln9UbE3IYv0="; }; strictDeps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cf952910163..f04c94930284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14840,37 +14840,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - # Work around while compatibility with ppxlib >= 0.26 is unavailable - # Should be removed when a fix is available - # See https://github.com/FStarLang/FStar/issues/2681 - ocamlPackages = - ocamlPackages.overrideScope' (self: super: { - ppxlib = super.ppxlib.override { - version = if lib.versionAtLeast self.ocaml.version "4.07" - then if lib.versionAtLeast self.ocaml.version "4.08" - then "0.24.0" else "0.15.0" else "0.13.0"; - }; - ppx_deriving_yojson = super.ppx_deriving_yojson.overrideAttrs (oldAttrs: rec { - version = "3.6.1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = "ppx_deriving_yojson"; - rev = "v${version}"; - sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; - }; - }); - sedlex = super.sedlex.overrideAttrs (oldAttrs: rec { - version = "2.5"; - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = "sedlex"; - rev = "v${version}"; - sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; - }; - }); - }); - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});