diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
| commit | b58780c43de1f6463d753c4dbf2506641cf1c678 (patch) | |
| tree | 858337275f05e2bd2fdfcac5f6574e200b00fb44 /pkgs/development/libraries/eigen | |
| parent | 88b11196c130b6bda5fd2e57729e876527c63377 (diff) | |
| parent | fde74242bf41d199ad68db90c5ce4d35f6c2c51b (diff) | |
| download | nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.gz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.bz2 nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.lz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.xz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.zst nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.zip | |
Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.
Diffstat (limited to 'pkgs/development/libraries/eigen')
| -rw-r--r-- | pkgs/development/libraries/eigen/2.0.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/libraries/eigen/default.nix | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix new file mode 100644 index 00000000000..6884aca16fc --- /dev/null +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, cmake}: + +let + v = "2.0.16"; +in +stdenv.mkDerivation { + name = "eigen-${v}"; + + src = fetchurl { + url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + name = "eigen-${v}.tar.bz2"; + sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + }; + + buildNativeInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + homepage = http://eigen.tuxfamily.org ; + maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + }; +} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 1311be53ab5..5653eec6d41 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - v = "2.0.16"; + v = "3.1.2"; in stdenv.mkDerivation { name = "eigen-${v}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; - sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + sha256 = "1hywvbn4a8f96fjn3cvd6nxzh5jvh05s1r263d9vqlgn25dxrzay"; }; nativeBuildInputs = [ cmake ]; |