From a98bb13b501ebd3382c4ab9eaa764e1f264eb660 Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Mon, 13 Nov 2023 15:22:19 +0100
Subject: [PATCH] Update compilers for C/C++ flakes

---
 env/flake_c++-with-libs.nix | 24 ++++++++++++------------
 env/flake_c++.nix           | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/env/flake_c++-with-libs.nix b/env/flake_c++-with-libs.nix
index eabadf36..77e4cf5c 100644
--- a/env/flake_c++-with-libs.nix
+++ b/env/flake_c++-with-libs.nix
@@ -23,13 +23,13 @@
         bintools = pkgs.bintools.bintools;
         libc = pkgs.glibc;
       };
-      gcc12 = pkgs.hiPrio (pkgs.wrapCCWith {
-        cc = pkgs.gcc12.cc;
+      gcc13 = pkgs.hiPrio (pkgs.wrapCCWith {
+        cc = pkgs.gcc13.cc;
         libc = pkgs.glibc;
         bintools = bintools;
       });
-      clang15 = pkgs.wrapCCWith {
-        cc = pkgs.clang_15.cc;
+      clang16 = pkgs.wrapCCWith {
+        cc = pkgs.clang_16.cc;
         libc = pkgs.glibc;
         bintools = bintools;
       };
@@ -39,13 +39,13 @@
         bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper
         libc = pkgs.glibc_multi;
       };
-      gcc12_multi = pkgs.hiPrio (pkgs.wrapCCWith {
-        cc = pkgs.gcc12.cc; # Get the unwrapped gcc from the wrapper
+      gcc13_multi = pkgs.hiPrio (pkgs.wrapCCWith {
+        cc = pkgs.gcc13.cc; # Get the unwrapped gcc from the wrapper
         libc = pkgs.glibc_multi;
         bintools = bintools_multi;
       });
-      clang15_multi = pkgs.wrapCCWith {
-        cc = pkgs.clang_15.cc;
+      clang16_multi = pkgs.wrapCCWith {
+        cc = pkgs.clang_16.cc;
         libc = pkgs.glibc_multi;
         bintools = bintools_multi;
       };
@@ -57,11 +57,11 @@
         packages = with pkgs; [
           # Compilers
           bintools
-          gcc12
-          clang15
+          gcc13
+          clang16
           # bintools_multi
-          # gcc12_multi
-          # clang14_multi
+          # gcc13_multi
+          # clang15_multi
 
           # Native buildinputs
           gnumake
diff --git a/env/flake_c++.nix b/env/flake_c++.nix
index 9dc7c740..0c5c3000 100644
--- a/env/flake_c++.nix
+++ b/env/flake_c++.nix
@@ -23,13 +23,13 @@
         bintools = pkgs.bintools.bintools;
         libc = pkgs.glibc;
       };
-      gcc12 = pkgs.hiPrio (pkgs.wrapCCWith {
-        cc = pkgs.gcc12.cc;
+      gcc13 = pkgs.hiPrio (pkgs.wrapCCWith {
+        cc = pkgs.gcc13.cc;
         libc = pkgs.glibc;
         bintools = bintools;
       });
-      clang15 = pkgs.wrapCCWith {
-        cc = pkgs.clang_15.cc;
+      clang16 = pkgs.wrapCCWith {
+        cc = pkgs.clang_16.cc;
         libc = pkgs.glibc;
         bintools = bintools;
       };
@@ -39,13 +39,13 @@
         bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper
         libc = pkgs.glibc_multi;
       };
-      gcc12_multi = pkgs.hiPrio (pkgs.wrapCCWith {
-        cc = pkgs.gcc12.cc; # Get the unwrapped gcc from the wrapper
+      gcc13_multi = pkgs.hiPrio (pkgs.wrapCCWith {
+        cc = pkgs.gcc13.cc; # Get the unwrapped gcc from the wrapper
         libc = pkgs.glibc_multi;
         bintools = bintools_multi;
       });
-      clang15_multi = pkgs.wrapCCWith {
-        cc = pkgs.clang_15.cc;
+      clang16_multi = pkgs.wrapCCWith {
+        cc = pkgs.clang_16.cc;
         libc = pkgs.glibc_multi;
         bintools = bintools_multi;
       };
@@ -55,11 +55,11 @@
         buildInputs = with pkgs; [
           # Compilers
           bintools
-          gcc12
-          clang15
+          gcc13
+          clang16
           # bintools_multi
-          # gcc12_multi
-          # clang14_multi
+          # gcc13_multi
+          # clang15_multi
 
           # Native buildinputs
           gnumake