Author: urkud
Date: Tue Feb 22 11:54:56 2011
New Revision: 26058
URL: https://svn.nixos.org/websvn/nix/?rev=26058&sc=1
Log:
Move eigen outside of kde-4.x
Michael, sorry for overriding your work but I want to maintain it...
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/
nixpkgs/trunk/pkgs/desktops/kde-4.6/support/eigen/
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
nixpkgs/trunk/pkgs/development/libraries/eigen/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 11:54:49
2011 (r26057)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 11:54:56
2011 (r26058)
@@ -33,8 +33,6 @@
attica = callPackage ./support/attica { };
- eigen = callPackage ./support/eigen { };
-
oxygen_icons = callPackage ./support/oxygen-icons { };
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 11:54:49
2011 (r26057)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 11:54:56
2011 (r26058)
@@ -32,8 +32,6 @@
attica = callPackage ./support/attica { };
- eigen = callPackage ./support/eigen { };
-
oxygen_icons = callPackage ./oxygen-icons { };
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
Modified: nixpkgs/trunk/pkgs/development/libraries/eigen/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/eigen/default.nix Tue Feb 22
11:54:49 2011 (r26057)
+++ nixpkgs/trunk/pkgs/development/libraries/eigen/default.nix Tue Feb 22
11:54:56 2011 (r26058)
@@ -1,49 +1,20 @@
-x@{builderDefsPackage
- , cmake
- , ...}:
-builderDefsPackage
-(a :
-let
- helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
- [];
+{stdenv, fetchurl, cmake}:
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
- sourceInfo = rec {
- baseName="eigen";
- version="2.0.15";
- name="${baseName}-${version}";
- ext="tar.bz2";
- project="${baseName}";
- url="http://bitbucket.org/${project}/${baseName}/get/${version}.${ext}";;
- hash="c68509b80ec2570d025a98e6c4279062b801593c5165ba3d683852e7dbff1569";
- };
+let
+ v = "2.0.15";
in
-rec {
- src = a.fetchurl {
- url = sourceInfo.url;
- sha256 = sourceInfo.hash;
- name="${sourceInfo.name}.${sourceInfo.ext}";
- };
-
- inherit (sourceInfo) name version;
- inherit buildInputs;
-
- phaseNames = ["doCmake" "doMakeInstall"];
-
- meta = {
- description = "A C++ linear algebra template header";
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
- linux;
- license = a.lib.licenses.lgpl3Plus;
+stdenv.mkDerivation {
+ name = "eigen-${v}";
+ src = fetchurl {
+ url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";;
+ name = "eigen-${v}.tar.bz2";
+ sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
};
- passthru = {
- updateInfo = {
- downloadPage = "http://eigen.tuxfamily.org/index.php?title=Main_Page";;
- };
+ 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 ];
};
-}) x
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
