Author: urkud
Date: Fri Mar 16 17:15:52 2012
New Revision: 33164
URL: https://nixos.org/websvn/nix/?rev=33164&sc=1
Log:
Try to update slr
Still fails to build because atlas doesn't provide full blas.
Modified:
nixpkgs/trunk/pkgs/applications/science/biology/slr/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/biology/slr/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/biology/slr/default.nix Fri Mar
16 17:15:47 2012 (r33163)
+++ nixpkgs/trunk/pkgs/applications/science/biology/slr/default.nix Fri Mar
16 17:15:52 2012 (r33164)
@@ -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)";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 16 17:15:47
2012 (r33163)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 16 17:15:52
2012 (r33164)
@@ -8104,9 +8104,7 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
