From 123ca02fe3a420cf7ddafed588977f82b5d3d033 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 3 May 2015 06:10:26 -0400
Subject: [PATCH] gcc51: rename gcc5 in light of new versioning scheme

---
 pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh            | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/default.nix           | 0
 .../development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch     | 0
 .../compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch          | 0
 .../development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch | 0
 pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch     | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/builder.sh (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/default.nix (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/gfortran-driving.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/gnat-cflags.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/java-jvgenmain-link.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/libstdc++-target.patch (100%)
 rename pkgs/development/compilers/gcc/{5.1 => 5}/no-sys-dirs.patch (100%)

diff --git a/pkgs/development/compilers/gcc/5.1/builder.sh b/pkgs/development/compilers/gcc/5/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/builder.sh
rename to pkgs/development/compilers/gcc/5/builder.sh
diff --git a/pkgs/development/compilers/gcc/5.1/default.nix b/pkgs/development/compilers/gcc/5/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/default.nix
rename to pkgs/development/compilers/gcc/5/default.nix
diff --git a/pkgs/development/compilers/gcc/5.1/gfortran-driving.patch b/pkgs/development/compilers/gcc/5/gfortran-driving.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/gfortran-driving.patch
rename to pkgs/development/compilers/gcc/5/gfortran-driving.patch
diff --git a/pkgs/development/compilers/gcc/5.1/gnat-cflags.patch b/pkgs/development/compilers/gcc/5/gnat-cflags.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/gnat-cflags.patch
rename to pkgs/development/compilers/gcc/5/gnat-cflags.patch
diff --git a/pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/java-jvgenmain-link.patch
rename to pkgs/development/compilers/gcc/5/java-jvgenmain-link.patch
diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5/libstdc++-target.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/libstdc++-target.patch
rename to pkgs/development/compilers/gcc/5/libstdc++-target.patch
diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc/5/no-sys-dirs.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16e31c620352..1d20f1ff2326 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3622,7 +3622,7 @@ let
       else null;
   }));
 
-  gcc51 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5.1 {
+  gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion