From c02bc80d863e875458c6611033b1becbc73693c2 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@matrix.ai>
Date: Mon, 9 May 2016 22:43:43 +1000
Subject: [PATCH 1/3] garcosim: Added tracefilegen and tracefilesim

---
 .../analysis/garcosim/tracefilegen/builder.sh | 17 ++++++++++++
 .../garcosim/tracefilegen/default.nix         | 25 ++++++++++++++++++
 .../garcosim/tracefilesim/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh
 create mode 100644 pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
 create mode 100644 pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix

diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh b/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh
new file mode 100644
index 000000000000..6c66eb25ba31
--- /dev/null
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh
@@ -0,0 +1,17 @@
+source "$stdenv"/setup
+
+cp --recursive "$src" ./
+
+chmod --recursive u=rwx ./"$(basename "$src")"
+
+cd ./"$(basename "$src")"
+
+cmake ./ 
+
+make
+
+mkdir --parents "$out"/bin
+cp ./TraceFileGen "$out"/bin
+
+mkdir --parents "$out"/share/doc/"$name"/html
+cp --recursive ./Documentation/html/* "$out/share/doc/$name/html/"
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
new file mode 100644
index 000000000000..49639943ff27
--- /dev/null
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake }:
+
+stdenv.mkDerivation rec {
+
+  name = "tracefilegen-2015-11-14";
+
+  src = fetchgit {
+    url = "https://github.com/GarCoSim/TraceFileGen.git";
+    rev = "4acf75b142683cc475c6b1c841a221db0753b404";
+    sha256 = "69b056298cf570debd3718b2e2cb7e63ad9465919c8190cf38043791ce61d0d6";
+  };
+
+  buildInputs = [ cmake ];
+
+  builder = ./builder.sh;
+  
+  meta = with stdenv.lib; {
+    description = "Automatically generate all types of basic memory management operations and write into trace files";
+    homepage = "https://github.com/GarCoSim"; 
+    maintainers = [ maintainers.cmcdragonkai ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
new file mode 100644
index 000000000000..0de094714327
--- /dev/null
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+
+  name = "tracefilesim-2015-11-07";
+  
+  src = fetchgit {
+    url = "https://github.com/GarCoSim/TraceFileSim.git";
+    rev = "368aa6b1d6560e7ecbd16fca47000c8f528f3da2";
+    sha256 = "22dfb60d1680ce6c98d60d12c0d0950073f02359605fcdef625e3049bca07809";
+  };
+  
+  installPhase = ''
+    mkdir --parents "$out/bin"
+    cp ./traceFileSim "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ease the analysis of existing memory management techniques, as well as the prototyping of new memory management techniques.";
+    homepage = "https://github.com/GarCoSim";
+    maintainers = [ maintainers.cmcdragonkai ];
+    licenses = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edb0e489a773..dd735a846eed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3521,6 +3521,10 @@ in
 
   tracebox = callPackage ../tools/networking/tracebox { };
 
+  tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
+
+  tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { };
+
   trash-cli = callPackage ../tools/misc/trash-cli { };
 
   trickle = callPackage ../tools/networking/trickle {};

From 83e9c5caaf2af9fdc7948b01ebc008d61381a16a Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Tue, 10 May 2016 22:00:43 +1000
Subject: [PATCH 2/3] Added cmcdragonkai to the list of maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 19f9300fe5d7..f023a4d70904 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -76,6 +76,7 @@
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
+  cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";

From 70c66e9828f95f25667a569a20e72ca52d9632f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 May 2016 10:27:57 +0200
Subject: [PATCH 3/3] tracefilegen, tracefilesim: fixup source hashes

and also whitespace. This is probably due to #15469.
---
 .../tools/analysis/garcosim/tracefilegen/default.nix        | 4 ++--
 .../tools/analysis/garcosim/tracefilesim/default.nix        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
index 49639943ff27..c290aefe31b7 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/GarCoSim/TraceFileGen.git";
     rev = "4acf75b142683cc475c6b1c841a221db0753b404";
-    sha256 = "69b056298cf570debd3718b2e2cb7e63ad9465919c8190cf38043791ce61d0d6";
+    sha256 = "0mh661l9d1lczv0mr2y9swzqqlwikyqiv1hdd71r9v8cvm54y5ij";
   };
 
   buildInputs = [ cmake ];
 
   builder = ./builder.sh;
-  
+
   meta = with stdenv.lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
     homepage = "https://github.com/GarCoSim"; 
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
index 0de094714327..01299966eb1b 100644
--- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
+++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation {
 
   name = "tracefilesim-2015-11-07";
-  
+
   src = fetchgit {
     url = "https://github.com/GarCoSim/TraceFileSim.git";
     rev = "368aa6b1d6560e7ecbd16fca47000c8f528f3da2";
-    sha256 = "22dfb60d1680ce6c98d60d12c0d0950073f02359605fcdef625e3049bca07809";
+    sha256 = "156m92k38ap4bzidbr8dzl065rni8lrib71ih88myk9z5y1x5nxm";
   };
-  
+
   installPhase = ''
     mkdir --parents "$out/bin"
     cp ./traceFileSim "$out/bin"