diff --git a/nix/default.nix b/nix/default.nix index e6b4407e808a5362913d3aff0b844a0a15d2f403..6decd85ca18d0a348861b788431df8e2f84ac335 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -10,7 +10,6 @@ let frama_clang_build = llvm_version, llvm?pkgs.${"llvm_"+llvm_version}, llvm_package?pkgs.${"llvmPackages_"+llvm_version} } : - (plugins.helpers.simple_plugin { inherit pkgs stdenv src opam2nix ocaml_version plugins; name = "frama-clang-on-llvm-" + llvm_version; @@ -34,5 +33,8 @@ in let new_pkgs = import newer_nix {}; in (frama_clang_build { llvm_version="9"; }) -// { on-llvm10 = (frama_clang_build { llvm_version="10"; });} -// { on-llvm11 = (frama_clang_build { pkgs = new_pkgs; llvm_version="11";});} + .extend( + self: super: + { on-llvm10 = (frama_clang_build { llvm_version="10"; }); + on-llvm11 = (frama_clang_build { pkgs = new_pkgs; llvm_version="11";}); + })