From 65b1613456bccb84a05e3426fcadb9d3f6355898 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Jul 2017 09:51:49 +0200
Subject: [PATCH] frama-c: 20161101 (Silicon) -> 20170501 (Phosphorus)

---
 .../tools/analysis/frama-c/default.nix        | 11 +++++-----
 .../tools/analysis/frama-c/dynamic.diff       | 20 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index ee36a9be43b2..1ce0ca161536 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
-, ltl2ba, coq, alt-ergo, why3 }:
+, ltl2ba, coq, alt-ergo, why3, autoconf
+}:
 
 let
   mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
@@ -8,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "20161101";
-  slang   = "Silicon";
+  version = "20170501";
+  slang   = "Phosphorus";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh";
+    sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1";
   };
 
   why2 = fetchurl {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ autoconf makeWrapper ];
 
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff
index 7ab2b32de1e7..737cad0cda4f 100644
--- a/pkgs/development/tools/analysis/frama-c/dynamic.diff
+++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff
@@ -1,12 +1,12 @@
 --- a/src/kernel_services/plugin_entry_points/dynamic.ml	2016-05-30 16:15:22.000000000 +0200
 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml	2016-10-13 18:25:31.000000000 +0200
-@@ -287,7 +287,8 @@
-         (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ;
-     let pkgs = ref [] in
-     List.iter (scan_directory pkgs) !load_path ;
--    let findlib_path = String.concat ":" !load_path in
-+    let findlib_path = String.concat ":" (!load_path @
-+      try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
-     Klog.debug ~dkey "setting findlib path to %s" findlib_path;
-     Findlib.init ~env_ocamlpath:findlib_path ();
-     load_packages (List.rev !pkgs) ;
+@@ -270,7 +270,8 @@
+   load_path :=
+     List.fold_right (add_dir ~user:true) path
+       (List.fold_right (add_dir ~user:false) Config.plugin_dir []);
+-  let findlib_path = String.concat ":" !load_path in
++  let findlib_path = String.concat ":" (!load_path @
++    try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
+   Klog.debug ~dkey "setting findlib path to %s" findlib_path;
+   Findlib.init ~env_ocamlpath:findlib_path ()
+