From ba5d8bd550d9818c8bf5eeebe8bba9b3b81d6eab Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 20 Apr 2021 14:57:59 +0200
Subject: [PATCH] [nix] retain old opamPackages name for better compatibility
with helpers.nix
---
nix/default.nix | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index ee9414ed133..0a46325110a 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -6,7 +6,7 @@ let opam-selection = {
selection = ./opam-selection.nix;
};
mk_opam_derivations = packages: opam2nix.resolve opam-selection packages;
- opam_packages =
+ opamPackages =
[ "ocamlfind" "zarith" "ocamlgraph" "yojson" "zmq"
"ppx_deriving" "ppx_deriving_yojson"
"coq=8.12.0" "alt-ergo=2.2.0" "why3=1.4.0" "why3-coq=1.4.0" ];
@@ -17,9 +17,9 @@ let opam-selection = {
# frama-c derivations
mk_deriv = args:
let my_opam_packages =
- if args?opam_packages then
- opam_packages ++ args.opam_packages
- else opam_packages
+ if args?opamPackages then
+ opamPackages ++ args.opamPackages
+ else opamPackages
;
in
stdenv.mkDerivation ({
@@ -33,8 +33,8 @@ in
pkgs.lib.makeExtensible
(self: {
- inherit src mk_buildInputs opam_packages mk_deriv;
- gen-opam-selection = mk_opam_derivations self.opam_packages;
+ inherit src mk_buildInputs opamPackages mk_deriv;
+ gen-opam-selection = mk_opam_derivations self.opamPackages;
buildInputs = mk_buildInputs {};
installed = self.main.out;
main = mk_deriv {
@@ -83,7 +83,7 @@ pkgs.lib.makeExtensible
lint = mk_deriv {
name = "frama-c-lint";
src = self.src;
- opam_packages = [ "ocp-indent=1.7.0" "headache=1.05"];
+ opamPackages = [ "ocp-indent=1.7.0" "headache=1.05"];
buildInputs =
self.mk_buildInputs { nixPackages = [ pkgs.bc ]; };
outputs = [ "out" ];
@@ -131,7 +131,7 @@ pkgs.lib.makeExtensible
name = "frama-c-build-distrib-tarball";
src = self.src;
buildInputs = self.buildInputs;
- opam_packages = [ "headache=1.05" ];
+ opamPackages = [ "headache=1.05" ];
outputs = [ "out" ];
postPatch = ''
patchShebangs .
@@ -154,7 +154,7 @@ pkgs.lib.makeExtensible
build-from-distrib-tarball = mk_deriv {
name = "frama-c-build-from-distrib-tarball";
buildInputs = self.buildInputs;
- opam_packages = self.build-distrib-tarball.opam_packages;
+ opamPackages = self.build-distrib-tarball.opamPackages;
src = self.build-distrib-tarball.out ;
outputs = [ "out" ];
configurePhase = ''
@@ -251,7 +251,7 @@ pkgs.lib.makeExtensible
internal = mk_deriv {
name = "frama-c-internal";
src = self.src;
- opam_packages = [ "xml-light" ];
+ opamPackages = [ "xml-light" ];
buildInputs =
self.mk_buildInputs
{ nixPackages =
--
GitLab