Support Nix depexts with opam env
#5982
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1114,11 +1114,12 @@ let print_depext_msg (avail, nf) = | |
|
|
||
| (* Gets depexts from the state, without checking again, unless [recover] is | ||
| true. *) | ||
| let get_depexts ?(force=false) ?(recover=false) t ~new_packages ~all_packages = | ||
| if not force && OpamStateConfig.(!r.no_depexts) then OpamSysPkg.Set.empty, OpamSysPkg.Set.empty else | ||
| let sys_packages = | ||
| if recover then | ||
| OpamSwitchState.depexts_status_of_packages t new_packages | ||
| ~old_packages:(OpamPackage.Set.diff all_packages new_packages) | ||
| else | ||
| let base = Lazy.force t.sys_packages in | ||
| (* workaround: st.sys_packages is not always updated with added | ||
|
|
@@ -1128,37 +1129,38 @@ let get_depexts ?(force=false) ?(recover=false) t packages = | |
| (* dirty heuristic: recompute for all non-canonical packages *) | ||
| OpamPackage.Map.find_opt nv t.repos_package_index | ||
| <> OpamSwitchState.opam_opt t nv) | ||
| new_packages | ||
| in | ||
| if OpamPackage.Set.is_empty more_pkgs then base else | ||
| OpamPackage.Map.union (fun _ x -> x) base | ||
| (OpamSwitchState.depexts_status_of_packages t more_pkgs ~old_packages:(OpamPackage.Set.diff all_packages more_pkgs)) | ||
| in | ||
| let avail, required, nf = | ||
| OpamPackage.Set.fold (fun pkg (avail,req,nf) -> | ||
| match OpamPackage.Map.find_opt pkg sys_packages with | ||
| | Some sys -> | ||
| OpamSysPkg.(Set.union avail sys.s_available), | ||
| OpamSysPkg.(Set.union req sys.s_required), | ||
| OpamSysPkg.(Set.union nf sys.s_not_found) | ||
| | None -> avail, req, nf) | ||
| all_packages (OpamSysPkg.Set.empty, OpamSysPkg.Set.empty, OpamSysPkg.Set.empty) | ||
| in | ||
| print_depext_msg (avail, nf); | ||
| avail, required | ||
|
|
||
| let install_sys_packages ~map_sysmap ~confirm ~sys_packages ~required env config t = | ||
| let rec entry_point t sys_packages required = | ||
| if OpamClientConfig.(!r.fake) then | ||
| (print_command sys_packages; t) | ||
| else if OpamFile.Config.depext_run_installs config then | ||
| if confirm then menu t sys_packages required else auto_install t sys_packages required | ||
| else | ||
| manual_install t sys_packages | ||
| and menu t sys_packages required = | ||
| let answer = | ||
| let pkgman = | ||
| OpamConsole.colorise `yellow | ||
| (OpamSysInteract.package_manager_name ~env (Option.map (fun t -> t.switch) t) config) | ||
| in | ||
| OpamConsole.menu ~unsafe_yes:`Yes ~default:`Yes ~no:`Quit | ||
| "opam believes some required external dependencies are missing. opam \ | ||
|
|
@@ -1177,7 +1179,7 @@ let install_sys_packages ~map_sysmap ~confirm env config sys_packages t = | |
| in | ||
| OpamConsole.msg "\n"; | ||
| match answer with | ||
| | `Yes -> auto_install t sys_packages required | ||
| | `No -> | ||
| OpamConsole.note "Use 'opam option depext-run-installs=false' \ | ||
| if you don't want to be prompted again."; | ||
|
|
@@ -1194,7 +1196,7 @@ let install_sys_packages ~map_sysmap ~confirm env config sys_packages t = | |
| if OpamSysPoll.os_distribution env = Some "cygwin" then | ||
| OpamSysInteract.Cygwin.check_setup ~update:false; | ||
| let commands = | ||
| OpamSysInteract.install_packages_commands ~env (Option.map (fun t -> t.switch) t) config sys_packages ~required | ||
| |> List.map (fun ((`AsAdmin c | `AsUser c), a) -> c::a) | ||
| in | ||
| OpamConsole.formatted_msg | ||
|
|
@@ -1221,19 +1223,19 @@ let install_sys_packages ~map_sysmap ~confirm env config sys_packages t = | |
| | `Continue -> check_again t sys_packages | ||
| | `Ignore -> bypass t | ||
| | `Quit -> give_up () | ||
| and auto_install t sys_packages required = | ||
| try | ||
| if OpamSysPoll.os_distribution env = Some "cygwin" then | ||
| OpamSysInteract.Cygwin.check_setup ~update:true; | ||
| OpamSysInteract.install ~env (Option.map (fun t -> t.switch) t) config sys_packages ~required; (* handles dry_run *) | ||
| map_sysmap (fun _ -> OpamSysPkg.Set.empty) t | ||
| with Failure msg -> | ||
| OpamConsole.error "%s" msg; | ||
| check_again t sys_packages | ||
| and check_again t sys_packages = | ||
| let open OpamSysPkg.Set.Op in | ||
| let needed, required, notfound = | ||
| OpamSysInteract.packages_status ~env config sys_packages ~old_packages:required | ||
| in | ||
| let still_missing = needed ++ notfound in | ||
| let installed = sys_packages -- still_missing in | ||
|
|
@@ -1250,7 +1252,7 @@ let install_sys_packages ~map_sysmap ~confirm env config sys_packages t = | |
| else | ||
| (OpamConsole.error "These packages are still missing: %s\n" | ||
| (syspkgs_to_string sys_packages); | ||
| if OpamStd.Sys.tty_in then entry_point t sys_packages required | ||
| else give_up ()) | ||
| and bypass t = | ||
| OpamConsole.note | ||
|
|
@@ -1269,19 +1271,20 @@ let install_sys_packages ~map_sysmap ~confirm env config sys_packages t = | |
| give_up_msg (); | ||
| OpamStd.Sys.exit_because `Aborted | ||
| in | ||
| if (OpamSysPkg.Set.is_empty sys_packages && OpamSysPkg.Set.is_empty required) || | ||
| OpamClientConfig.(!r.show) || | ||
| OpamClientConfig.(!r.assume_depexts) then | ||
| t | ||
| else | ||
| try | ||
| OpamConsole.header_msg "Handling external dependencies"; | ||
| OpamConsole.msg "\n"; | ||
| entry_point t sys_packages required | ||
| with Sys.Break as e -> OpamStd.Exn.finalise e give_up_msg | ||
|
|
||
| let install_depexts ?(force_depext=false) ?(confirm=true) t ~new_packages ~all_packages = | ||
| let map_sysmap f t = | ||
| let t = Option.get t in | ||
|
There was a problem hiding this comment. could you explain why all these There was a problem hiding this comment. It's because I don't have access to the switch state here edd9030#diff-6426799f367266b2a65325c870931b51df35852e12ddbe8580e74f4eeeb58177R1606 afaik because it hasn't been created at this point. We need to pass it in to |
||
| let sys_packages = | ||
| OpamPackage.Set.fold (fun nv sys_map -> | ||
| match OpamPackage.Map.find_opt nv sys_map with | ||
|
|
@@ -1291,23 +1294,23 @@ let install_depexts ?(force_depext=false) ?(confirm=true) t packages = | |
| f status.OpamSysPkg.s_available } | ||
| sys_map | ||
| | None -> sys_map) | ||
| new_packages | ||
| (Lazy.force t.sys_packages) | ||
| in | ||
| Some { t with sys_packages = lazy sys_packages } | ||
| in | ||
| let confirm = | ||
| confirm && not (OpamSysInteract.Cygwin.is_internal t.switch_global.config) | ||
| in | ||
| let sys_packages, required = | ||
| get_depexts ~force:force_depext ~recover:force_depext t ~new_packages ~all_packages | ||
| in | ||
| let env = t.switch_global.global_variables in | ||
| let config = t.switch_global.config in | ||
| Option.get @@ install_sys_packages ~map_sysmap ~confirm env config ~sys_packages ~required (Some t) | ||
|
|
||
| let install_sys_packages ~confirm = | ||
| install_sys_packages ~map_sysmap:(fun _ t -> t) ~confirm | ||
|
|
||
| (* Apply a solution *) | ||
| let apply ?ask t ~requested ?print_requested ?add_roots | ||
|
|
@@ -1330,9 +1333,9 @@ let apply ?ask t ~requested ?print_requested ?add_roots | |
| in | ||
| let t = | ||
| if OpamClientConfig.(!r.show) then | ||
| let _ = get_depexts t ~new_packages:virt_inst ~all_packages:t.installed in t | ||
| (* Prints the msg about additional depexts to install *) | ||
| else install_depexts t ~new_packages:virt_inst ~all_packages:t.installed | ||
| in | ||
| t, Nothing_to_do | ||
| else ( | ||
|
|
@@ -1386,13 +1389,14 @@ let apply ?ask t ~requested ?print_requested ?add_roots | |
| solution0; | ||
| ); | ||
| if OpamClientConfig.(!r.show) then | ||
| let _ = get_depexts t ~new_packages:new_state0.installed ~all_packages:new_state0.installed in | ||
| (* Prints the msg about additional depexts to install *) | ||
| t, Aborted | ||
| else if download_only || confirmation ?ask names solution then ( | ||
| let t = | ||
| install_depexts t | ||
| ~new_packages:(OpamPackage.Set.inter new_state0.installed (OpamSolver.all_packages solution0)) | ||
| ~all_packages:new_state0.installed | ||
| in | ||
| let requested = | ||
| OpamPackage.packages_of_names new_state.installed names | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think it might be worth using a dedicated record instead of a tuple at this point. Otherwise it could become confusing very quickly with all those similar types around
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have
opamSysPkg.status?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Though, we're also passing around the couple of
availableandrequireda lot, which perhaps warrants a separate record.