public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frama-c: 20161101 (Silicon) -> 20170501 (Phosphorus)

Browse Source
This commit is contained in:
Vincent Laporte 2017-07-18 09:51:49 +02:00
parent 8dccc9b699
commit 65b1613456
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
, ltl2ba, coq, alt-ergo, why3 }: , ltl2ba, coq, alt-ergo, why3, autoconf
}:
let let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
@ -8,12 +9,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "frama-c-${version}"; name = "frama-c-${version}";
version = "20161101"; version = "20170501";
slang = "Silicon"; slang = "Phosphorus";
src = fetchurl { src = fetchurl {
url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh"; sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1";
}; };
why2 = fetchurl { why2 = fetchurl {
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ autoconf makeWrapper ];
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph

20
pkgs/development/tools/analysis/frama-c/dynamic.diff
View File

@ -1,12 +1,12 @@
--- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 --- 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 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200
@@ -287,7 +287,8 @@ @@ -270,7 +270,8 @@
(List.fold_right (add_dir ~user:false) Config.plugin_dir []) ; load_path :=
let pkgs = ref [] in List.fold_right (add_dir ~user:true) path
List.iter (scan_directory pkgs) !load_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 in
+ let findlib_path = String.concat ":" (!load_path @ + let findlib_path = String.concat ":" (!load_path @
+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in + try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
Klog.debug ~dkey "setting findlib path to %s" findlib_path; Klog.debug ~dkey "setting findlib path to %s" findlib_path;
Findlib.init ~env_ocamlpath:findlib_path (); Findlib.init ~env_ocamlpath:findlib_path ()
load_packages (List.rev !pkgs) ;