[Nix-dev] Re: [Nix-commits] SVN commit: nix - 21638 - simons - in nixpkgs/trunk/pkgs: development/libraries/boost top-level

[Lluís Batlle i Rossell]

Hello Peter,

what if we rename the 1.43.0.nix to default.nix? I wanted that since long ago.
Do you agree?

Regards,
Lluís
On Fri, May 07, 2010 at 09:32:48AM +0000, Peter Simons wrote:
> Author: simons
> Date: 2010-05-07 09:32:46 +0000 (Fri, 07 May 2010)
> New Revision: 21638
> 
> You can view the changes in this commit at:
>    https://svn.nixos.org/viewvc/nix?rev=21638&view=rev
> 
> Added:
>    nixpkgs/trunk/pkgs/development/libraries/boost/1.43.0.nix
> Modified:
>    nixpkgs/trunk/pkgs/top-level/all-packages.nix
> 
> Log:
> pkgs/development/libraries/boost: updated boost to 1.43.0
> 
> Changes:
> 
> Added: nixpkgs/trunk/pkgs/development/libraries/boost/1.43.0.nix
> ===================================================================
> --- nixpkgs/trunk/pkgs/development/libraries/boost/1.43.0.nix	                        (rev 0)
> +++ nixpkgs/trunk/pkgs/development/libraries/boost/1.43.0.nix	2010-05-07 09:32:46 UTC (rev 21638)
> @@ -0,0 +1,59 @@
> +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
> +, enableRelease ? true
> +, enableDebug ? false
> +, enableSingleThreaded ? false
> +, enableMultiThreaded ? true
> +, enableShared ? true
> +, enableStatic ? false
> +, enablePIC ? false
> +}:
> +
> +let
> +
> +  variant = stdenv.lib.concatStringsSep ","
> +    (stdenv.lib.optional enableRelease "release" ++
> +     stdenv.lib.optional enableDebug "debug");
> +
> +  threading = stdenv.lib.concatStringsSep ","
> +    (stdenv.lib.optional enableSingleThreaded "single" ++
> +     stdenv.lib.optional enableMultiThreaded "multi");
> +
> +  link = stdenv.lib.concatStringsSep ","
> +    (stdenv.lib.optional enableShared "shared" ++
> +     stdenv.lib.optional enableStatic "static");
> +
> +  # To avoid library name collisions
> +  finalLayout = if ((enableRelease && enableDebug) ||
> +    (enableSingleThreaded && enableMultiThreaded) ||
> +    (enableShared && enableStatic)) then
> +    "tagged" else "system";
> +
> +  cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
> +
> +in
> +
> +stdenv.mkDerivation {
> +  name = "boost-1.43.0";
> +
> +  meta = {
> +    homepage = "http://boost.org/";
> +    description = "Boost C++ Library Collection";
> +    license = "boost-license";
> +
> +    maintainers = [ stdenv.lib.maintainers.simons ];
> +  };
> +
> +  src = fetchurl {
> +    url = "mirror://sourceforge/boost/boost_1_43_0.tar.bz2";
> +    sha256 = "0831h19ph65r2rai6ipk5c2bx04af8q423mzr89fh454385i0krl";
> +  };
> +
> +  buildInputs = [icu expat zlib bzip2 python];
> +
> +  configureScript = "./bootstrap.sh";
> +  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
> +
> +  buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
> +
> +  installPhase = ":";
> +}
> 
> Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
> ===================================================================
> --- nixpkgs/trunk/pkgs/top-level/all-packages.nix	2010-05-07 07:38:35 UTC (rev 21637)
> +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix	2010-05-07 09:32:46 UTC (rev 21638)
> @@ -3502,7 +3502,7 @@
>      inherit fetchurl stdenv icu expat zlib bzip2 python;
>    };
>  
> -  boost = makeOverridable (import ../development/libraries/boost/1.42.0.nix) {
> +  boost = makeOverridable (import ../development/libraries/boost/1.43.0.nix) {
>      inherit fetchurl stdenv icu expat zlib bzip2 python;
>    };
>  
> 
> _______________________________________________
> nix-commits mailing list
> nix-commits at cs.uu.nl
> http://mail.cs.uu.nl/mailman/listinfo/nix-commits