Author: ludo Date: 2010-06-17 17:06:40 +0000 (Thu, 17 Jun 2010) New Revision: 22312
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22312&view=rev Added: nixpkgs/trunk/pkgs/applications/science/misc/simgrid/ nixpkgs/trunk/pkgs/applications/science/misc/simgrid/default.nix Removed: nixpkgs/trunk/pkgs/applications/misc/simgrid/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Move SimGrid under `science/misc'. Changes: Deleted: nixpkgs/trunk/pkgs/applications/misc/simgrid/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/misc/simgrid/default.nix 2010-06-17 17:06:09 UTC (rev 22311) +++ nixpkgs/trunk/pkgs/applications/misc/simgrid/default.nix 2010-06-17 17:06:40 UTC (rev 22312) @@ -1,59 +0,0 @@ -{ fetchurl, stdenv, cmake, ruby }: - -stdenv.mkDerivation rec { - name = "simgrid-3.4.1"; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";; - sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28"; - }; - - /* FIXME: Ruby currently disabled because of this: - - Linking C shared library ../src/.libs/libsimgrid.so - ld: cannot find -lruby-1.8.7-p72 - - */ - buildInputs = [ cmake /* ruby */ ]; - - preConfigure = - # Make it so that libsimgrid.so will be found when running programs from - # the build dir. - '' export LD_LIBRARY_PATH="$PWD/src/.libs" - export cmakeFlags="-Dprefix=$out" - ''; - - makeFlags = "VERBOSE=1"; - - patchPhase = - '' for i in "src/smpi/"* - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - done - ''; - - installPhase = "make install-simgrid"; - - # Fixing the few tests that fail is left as an exercise to the reader. - doCheck = false; - - meta = { - description = "SimGrid, a simulator for distributed applications in heterogeneous environments"; - - longDescription = - '' SimGrid is a toolkit that provides core functionalities for the - simulation of distributed applications in heterogeneous distributed - environments. The specific goal of the project is to facilitate - research in the area of distributed and parallel application - scheduling on distributed computing platforms ranging from simple - network of workstations to Computational Grids. - ''; - - homepage = http://simgrid.gforge.inria.fr/; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} Copied: nixpkgs/trunk/pkgs/applications/science/misc/simgrid/default.nix (from rev 22311, nixpkgs/trunk/pkgs/applications/misc/simgrid/default.nix) =================================================================== --- nixpkgs/trunk/pkgs/applications/science/misc/simgrid/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/applications/science/misc/simgrid/default.nix 2010-06-17 17:06:40 UTC (rev 22312) @@ -0,0 +1,59 @@ +{ fetchurl, stdenv, cmake, ruby }: + +stdenv.mkDerivation rec { + name = "simgrid-3.4.1"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";; + sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28"; + }; + + /* FIXME: Ruby currently disabled because of this: + + Linking C shared library ../src/.libs/libsimgrid.so + ld: cannot find -lruby-1.8.7-p72 + + */ + buildInputs = [ cmake /* ruby */ ]; + + preConfigure = + # Make it so that libsimgrid.so will be found when running programs from + # the build dir. + '' export LD_LIBRARY_PATH="$PWD/src/.libs" + export cmakeFlags="-Dprefix=$out" + ''; + + makeFlags = "VERBOSE=1"; + + patchPhase = + '' for i in "src/smpi/"* + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + done + ''; + + installPhase = "make install-simgrid"; + + # Fixing the few tests that fail is left as an exercise to the reader. + doCheck = false; + + meta = { + description = "SimGrid, a simulator for distributed applications in heterogeneous environments"; + + longDescription = + '' SimGrid is a toolkit that provides core functionalities for the + simulation of distributed applications in heterogeneous distributed + environments. The specific goal of the project is to facilitate + research in the area of distributed and parallel application + scheduling on distributed computing platforms ranging from simple + network of workstations to Computational Grids. + ''; + + homepage = http://simgrid.gforge.inria.fr/; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-17 17:06:09 UTC (rev 22311) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-17 17:06:40 UTC (rev 22312) @@ -8595,11 +8595,6 @@ }; }; - simgrid = import ../applications/misc/simgrid { - inherit fetchurl cmake ruby; - stdenv = stdenv2; - }; - skype_linux = import ../applications/networking/skype { inherit fetchurl stdenv; inherit alsaLib freetype fontconfig zlib; @@ -9569,6 +9564,11 @@ ### SCIENCE / MISC + simgrid = import ../applications/science/misc/simgrid { + inherit fetchurl cmake ruby; + stdenv = stdenv2; + }; + tulip = import ../applications/science/misc/tulip { inherit fetchurl stdenv libxml2 freetype mesa glew autoconf automake libtool; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
