diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-11-05 09:42:47 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-11-05 09:42:47 +0100 |
| commit | a821be753127499d2d17a2b1091b65655e5408c9 (patch) | |
| tree | de613cbef75be1e82467607274a385d86ef7d998 /pkgs/applications/science | |
| parent | 8a958711937ce99c550b0e55af84fdc86c4d222c (diff) | |
| parent | 79b173c35832863dc5d018546d6b8d677dccb024 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/picard-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/lean/default.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index d496e78748d9..0353f2e7cebd 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.4"; + version = "2.23.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q"; + sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index eae2e384df40..749220382c64 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -15,9 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; enableParallelBuilding = true; - preConfigure = '' - cd src - ''; + cmakeDir = "../src"; + + # Running the tests is required to build the *.olean files for the core + # library. + doCheck = true; + + postPatch = "patchShebangs ."; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace $out/bin/leanpkg \ |