From a74b1732a70972459f56b190d7f1957ff656dd29 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 11 Feb 2024 10:44:44 +0000
Subject: [PATCH 1/2] timeloop: fix `gcc-13` build failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change build fails on `master` as
https://hydra.nixos.org/build/248973743:

    include/compound-config/compound-config.hpp:149:8: error: ‘uint64_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
      149 |   std::uint64_t parseElementSize(std::string name);
          |        ^~~~~~~~
          |        wint_t
---
 .../science/computer-architecture/timeloop/default.nix        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix
index 4e794aaa29e2..6d069ebcc8f3 100644
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
 
   postPatch = ''
+    # Fix gcc-13 build failure due to missing includes:
+    sed -e '1i #include <cstdint>' -i \
+      include/compound-config/compound-config.hpp
+
     # use nix ar/ranlib
     substituteInPlace ./SConstruct \
       --replace "env.Replace(AR = \"gcc-ar\")" "" \

From 3bbdc26df2dc6eaeac472e675f3e647150bed06d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 13 Feb 2024 08:17:00 +0000
Subject: [PATCH 2/2] timeloop: unstable-2022-11-29 -> 3.0.3

Changes:
- https://github.com/NVlabs/timeloop/releases/tag/v3.0
- https://github.com/NVlabs/timeloop/releases/tag/v3.0.1
- https://github.com/NVlabs/timeloop/releases/tag/v3.0.2
- https://github.com/NVlabs/timeloop/releases/tag/v3.0.3
---
 .../science/computer-architecture/timeloop/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix
index 6d069ebcc8f3..ec8ec3ed8abc 100644
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timeloop";
-  version = "unstable-2022-11-29";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "NVlabs";
     repo = "timeloop";
-    rev = "905ba953432c812772de935d57fd0a674a89d3c1";
-    hash = "sha256-EXiWXf8hdX4vFRNk9wbFSOsix/zVkwrafGUtFrsoAN0=";
+    rev = "v${version}";
+    hash = "sha256-CGPhrBNzFdERAA/Eym2v0+FvFUe+VkBLnwYEqEMHE9k=";
   };
 
   nativeBuildInputs = [ scons ];
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
 
     # use nix ar/ranlib
     substituteInPlace ./SConstruct \
-      --replace "env.Replace(AR = \"gcc-ar\")" "" \
-      --replace "env.Replace(RANLIB = \"gcc-ranlib\")" ""
+      --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \
+      --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass"
     '' + lib.optionalString stdenv.isDarwin ''
     # prevent clang from dying on errors that gcc is fine with
     substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override"