From 1ee742b0ef2904788e1775d73de42c00492e8c4f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 14:27:46 -0500
Subject: [PATCH] nixpkgs: afl 1.80b -> 1.83b

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/analysis/infer/default.nix          | 33 +++++++++++++++++++
 pkgs/tools/security/afl/default.nix           |  4 +--
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/infer/default.nix

diff --git a/pkgs/development/tools/analysis/infer/default.nix b/pkgs/development/tools/analysis/infer/default.nix
new file mode 100644
index 000000000000..35dbd08a870e
--- /dev/null
+++ b/pkgs/development/tools/analysis/infer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  name    = "infer-${version}";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz";
+    sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m";
+  };
+
+  buildInputs = [ python ];
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/libexec $out/bin;
+    cp -R facebook-clang-plugin $out/libexec
+    cp -R infer $out/libexec
+    for x in `ls $out/libexec/infer/infer/bin`; do
+      ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x;
+    done
+  '';
+  fixupPhase = ''
+    patchShebangs $out
+  '';
+
+  meta = {
+    description = "Scalable static analyzer for Java, C and Objective-C";
+    homepage    = http://fbinfer.com;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 2aed8df32605..ff9798b3f751 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.80b";
+  version = "1.83b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0";
+    sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 000027a9125a..7db222330245 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5302,6 +5302,8 @@ let
 
   csslint = callPackage ../development/web/csslint { };
 
+  infer = callPackage ../development/tools/analysis/infer { };
+
   libcxx = llvmPackages.libcxx;
   libcxxabi = llvmPackages.libcxxabi;