From 7fc97cf30b455f62af0b10ff99f8330a6e0170f8 Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Tue, 26 May 2020 18:34:10 -0400 Subject: [PATCH] idris2: 0.2.0-840e020 -> 0.2.0 * Upgrade to release version of idris2 * Add config for proper testing phase --- pkgs/development/compilers/idris2/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 858da311011..998a02633f2 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -3,15 +3,15 @@ }: # Uses scheme to bootstrap the build of idris2 -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "idris2"; - version = "0.2.0-840e020"; + version = "0.2.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; - rev = "840e020d8ccc332135e86f855ad78053ca15d603"; - sha256 = "1l6pdjiglwd13pf56xwzbjzyyxgz48ypfggjgsgqk2w57rmbfy90"; + rev = "v${version}"; + sha256 = "153z6zgb90kglw8rspk8ph5gh5nkplhi27mxai6yqbbjs2glx5d4"; }; strictDeps = true; @@ -20,19 +20,18 @@ stdenv.mkDerivation { prePatch = '' patchShebangs --build tests - - # Do not run tests as part of the build process - substituteInPlace bootstrap.sh --replace "make test" "# make test" ''; makeFlags = [ "PREFIX=$(out)" ]; # The name of the main executable of pkgs.chez is `scheme` - buildFlags = [ "bootstrap" "SCHEME=scheme" ]; + buildFlags = [ "bootstrap-build" "SCHEME=scheme" ]; + + checkTarget = "bootstrap-test"; # idris2 needs to find scheme at runtime to compile postInstall = '' - wrapProgram "$out/bin/idris2" --prefix PATH : "${chez}/bin" + wrapProgram "$out/bin/idris2" --set CHEZ "${chez}/bin/scheme" ''; meta = {