From 36c430de12ed21d407a13c6922268cf17bc73368 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 17 Jan 2016 09:29:05 +0100 Subject: [PATCH 1/2] lean: 20150821 -> 20160117 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 5a4e2cbbc05..995c43efe3b 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "20150821"; + version = "20160117"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b"; - sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka"; + rev = "b2554dcb8f45899ccce84f226cd67b6460442930"; + sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms"; }; buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; From 8a26d9b84f566b5ead7744f425f4e5f41865a060 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 17 Jan 2016 09:29:18 +0100 Subject: [PATCH 2/2] lean: add wrapper for linja --- pkgs/applications/science/logic/lean/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 995c43efe3b..92c306c4082 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python -, gperftools, ninja }: +, gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { name = "lean-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms"; }; - buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; + buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ]; enableParallelBuilding = true; preConfigure = '' @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + postInstall = '' + wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin + ''; + meta = { description = "Automatic and interactive theorem prover"; homepage = "http://leanprover.github.io";