Merge branch 'feature/upgrade-opam2nix' into 'master'

Update Frama-CI data

See merge request frama-c/meta!46

nix/default.nix

 # paramaterised derivation with dependencies injected (callPackage style)
 { pkgs, stdenv, opam2nix,
   src ? ../.,
-  ocaml_version ? "ocamlPackages_latest.ocaml",
+  ocaml ? "ocamlPackages_latest.ocaml",
   plugins ? { },
   plugin_extend ? self: super: { }
 }:
 
 plugins.helpers.simple_plugin
-  { inherit pkgs stdenv src opam2nix ocaml_version plugins plugin_extend;
+  { inherit pkgs stdenv src opam2nix ocaml plugins plugin_extend;
     name = "meta";
     deps = [ pkgs.swiProlog ];
     preFramaCTests = ''

nix/frama-ci.nix

 #To copy in other repository
-{ pkgs, password}:
+{ password}:
 
 let
     src = builtins.fetchGit {
             "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
             "name" = "Frama-CI";
-            "rev" = "f86e807d6f440ac4479b78f8419dfd817803419d";
-            "ref" = "feature/wp/versions-bump";
+            "rev" = "c573f802c66f3821d0bac5f0b71eceaed26b26f1";
+            "ref" = "feature/upgrade-opam2nix";
     };
+    pkgs = import "${src}/pkgs.nix" {};
  in
  {
   src = src;