diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-16 17:15:52 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-16 17:15:52 +0000 |
commit | 75207a6a90ece8b2eac6f0a071bf2b8354151bbf (patch) | |
tree | c58fb975d586b6aac3ba9bbc028b2f1840e33670 | |
parent | eefb2b65318540804e8748bb45102432a6386757 (diff) | |
download | nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar.gz nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar.bz2 nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar.lz nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar.xz nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.tar.zst nixlib-75207a6a90ece8b2eac6f0a071bf2b8354151bbf.zip |
Try to update slr
Still fails to build because atlas doesn't provide full blas. svn path=/nixpkgs/trunk/; revision=33164
-rw-r--r-- | pkgs/applications/science/biology/slr/default.nix | 18 | ||||
-rw-r--r-- | 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 629c10aecdff..7111d1a854e5 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 de0856ce81b2..33579045b7d0 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 { }; |