Author: viric Date: 2010-06-15 12:11:40 +0000 (Tue, 15 Jun 2010) New Revision: 22276
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22276&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Log: Uh, there were references to gcc44_real still. I hope not anymore. I decided to update gfortran to gfortran45 (it was gfortran43) Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 11:57:22 UTC (rev 22275) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 12:11:40 UTC (rev 22276) @@ -2178,7 +2178,7 @@ texinfo = texinfo49; }); - gfortran = gfortran43; + gfortran = gfortran45; gfortran40 = wrapGCC (gcc40.gcc.override { langFortran = true; @@ -2210,7 +2210,7 @@ profiledCompiler = false; }); - gfortran44 = wrapGCC (gcc44_real.gcc.override { + gfortran44 = wrapGCC (gcc44.gcc.override { name = "gfortran"; langFortran = true; langCC = false; @@ -2218,9 +2218,17 @@ profiledCompiler = false; }); + gfortran45 = wrapGCC (gcc45_real.gcc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj45; - gcj44 = wrapGCC (gcc44_real.gcc.override { + gcj44 = wrapGCC (gcc44.gcc.override { name = "gcj"; langJava = true; langFortran = false; @@ -2248,9 +2256,9 @@ libXrandr xproto renderproto xextproto inputproto randrproto; }); - gnat = gnat44; + gnat = gnat45; - gnat44 = wrapGCC (gcc44_real.gcc.override { + gnat44 = wrapGCC (gcc44.gcc.override { name = "gnat"; langCC = false; langC = true; @@ -2263,6 +2271,19 @@ ppl = null; }); + gnat45 = wrapGCC (gcc45_real.gcc.override { + name = "gnat"; + langCC = false; + langC = true; + langAda = true; + profiledCompiler = false; + inherit gnatboot; + # We can't use the ppl stuff, because we would have + # libstdc++ problems. + cloogppl = null; + ppl = null; + }); + gnatboot = wrapGCC (import ../development/compilers/gnatboot { inherit fetchurl stdenv; }); _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
