From 75207a6a90ece8b2eac6f0a071bf2b8354151bbf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Mar 2012 17:15:52 +0000 Subject: [PATCH] Try to update slr Still fails to build because atlas doesn't provide full blas. svn path=/nixpkgs/trunk/; revision=33164 --- .../science/biology/slr/default.nix | 18 ++++++------------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix index 629c10aecdf..7111d1a854e 100644 --- a/pkgs/applications/science/biology/slr/default.nix +++ b/pkgs/applications/science/biology/slr/default.nix @@ -1,22 +1,16 @@ {stdenv, fetchurl, liblapack}: stdenv.mkDerivation { - name = "slr"; + name = "slr-1.4.2"; + src = fetchurl { - url = http://www.ebi.ac.uk/goldman-srv/SLR/download/current/slr_source.tgz; - sha256 = "0i81fv201p187mim4zakipxnhzqdvd3p5a9qa59xznc6458r2zsn"; + url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz; + sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp"; }; buildInputs = [ liblapack ]; - buildPhase = '' - cd src - ls - make -fMakefile.linux - ''; - installPhase = '' - mkdir -p $out/bin - cp -v ../Slr $out/bin - ''; + preConfigure = "mkdir bin; cd src"; + makeFlags = "-f Makefile.linux"; meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de0856ce81b..33579045b7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8104,9 +8104,7 @@ let paml = callPackage ../applications/science/biology/paml { }; - /* slr = import ../applications/science/biology/slr { - inherit fetchurl stdenv liblapack; - }; */ + /* slr = callPackage ../applications/science/biology/slr { }; */ pal2nal = callPackage ../applications/science/biology/pal2nal { };