Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Features

- Add support for `buildNpmPackage`
- Dune: extract dependencies from `dune-project` and `.opam` files

### Fixes

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Options:
- `buildPythonApplication` and `buildPythonPackage`
- `buildGoModule`
- `buildNpmPackage`
- `buildDunePackage`

### Supported fetchers

Expand Down
1 change: 1 addition & 0 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ pub struct Opts {
#[derive(Clone, ValueEnum)]
#[clap(rename_all = "camelCase")]
pub enum BuilderFunction {
BuildDunePackage,
BuildGoModule,
BuildNpmPackage,
BuildPythonApplication,
Expand Down
111 changes: 111 additions & 0 deletions src/codegen/dune.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
use anyhow::Result;
use parse_display::Display;

use crate::{
codegen::{Builder, Codegen},
lang::dune::get_dune_dependencies,
};

#[derive(Clone, Copy, Display)]
#[display("buildDunePackage")]
pub struct BuildDunePackage;

impl Builder for BuildDunePackage {
fn function(&self) -> &'static str {
"buildDunePackage"
}

fn after_inputs(&self, cg: &mut Codegen<'_>) -> Result<String> {
let deps = get_dune_dependencies(cg.src_dir);

for tool in deps.tools {
cg.inputs
.native_build_inputs
.always
.insert(format!("ocamlPackages.{tool}"));
}
for dep in &deps.build {
cg.inputs
.build_inputs
.always
.insert(format!("ocamlPackages.{dep}"));
}
for dep in &deps.check {
cg.inputs
.check_inputs
.always
.insert(format!("ocamlPackages.{dep}"));
}
for license in deps.licenses {
cg.licenses.insert(license, 1.0);
}

Ok(String::new())
}
}

#[cfg(test)]
mod tests {
use std::{collections::BTreeMap, fs::write};

use insta::assert_snapshot;
use tempfile::TempDir;

use super::*;
use crate::codegen::SourceLayout;

async fn generate_dune(dune_project: bool) -> String {
let dir = TempDir::new().unwrap();
if dune_project {
write(
dir.path().join("dune-project"),
include_str!("../lang/fixtures/ocaml-lsp.dune-project"),
)
.unwrap();
} else {
write(
dir.path().join("ocaml-lsp-server.opam"),
include_str!("../lang/fixtures/ocaml-lsp-server.opam"),
)
.unwrap();
}
let dir_path = dir.path().to_owned();

let mut frontend = crate::frontend::headless();
let cg = Codegen {
description: "LSP Server for OCaml".into(),
fetcher_input: "fetchFromGitHub".into(),
file_url_prefix: None,
frontend: &mut frontend,
inputs: Default::default(),
layout: SourceLayout::detect(dir_path.as_path()),
licenses: BTreeMap::new(),
maintainers: &["alice".to_string()],
nix_update_script: true,
nixpkgs: "<nixpkgs>",
out: String::new(),
out_dir: None,
overwrite: None,
pname: "ocaml-lsp",
python_deps: Default::default(),
releases_page: None,
src: "src",
src_dir: &dir_path,
src_expr: "src",
url: "https://github.com/ocaml/ocaml-lsp",
version: "1.27.0",
};

cg.generate(BuildDunePackage).await.unwrap()
}

#[tokio::test]
async fn code_dune_project() {
assert_snapshot!(generate_dune(true).await);
}

#[tokio::test]
async fn code_opam() {
assert_snapshot!(generate_dune(false).await);
}
}
13 changes: 10 additions & 3 deletions src/codegen/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod drv;
pub mod dune;
pub mod go;
pub mod npm;
pub mod python;
Expand Down Expand Up @@ -26,8 +27,8 @@ use tracing::warn;
use crate::{
cli::CargoVendor,
codegen::{
drv::MkDerivation, go::BuildGoModule, npm::BuildNpmPackage, python::BuildPythonPackage,
rust::BuildRustPackage,
drv::MkDerivation, dune::BuildDunePackage, go::BuildGoModule, npm::BuildNpmPackage,
python::BuildPythonPackage, rust::BuildRustPackage,
},
frontend::FrontendDispatch,
inputs::{AllInputs, write_all_lambda_inputs, write_inputs, write_lambda_input},
Expand All @@ -43,6 +44,7 @@ use crate::{
#[derive(Clone, Copy, Display)]
#[display("{0}")]
pub enum BuilderDispatch {
BuildDunePackage(BuildDunePackage),
BuildGoModule(BuildGoModule),
BuildNpmPackage(BuildNpmPackage),
BuildPythonPackage(BuildPythonPackage),
Expand Down Expand Up @@ -77,6 +79,7 @@ pub struct Codegen<'a> {
pub struct SourceLayout {
pub has_cargo: bool,
pub has_cargo_lock: bool,
pub has_dune: bool,
pub has_cmake: bool,
pub has_go: bool,
pub has_meson: bool,
Expand Down Expand Up @@ -217,7 +220,7 @@ impl Codegen<'_> {
if cargo_deps.is_some() {
write_lambda_input(&mut self.out, &mut written, "rustPlatform")?;
}
let (native_build_inputs, build_inputs) =
let (native_build_inputs, build_inputs, check_inputs) =
write_all_lambda_inputs(&mut self.out, &self.inputs, &mut written)?;
for input in builder.extra_lambda_inputs(&self) {
write_lambda_input(&mut self.out, &mut written, &input)?;
Expand Down Expand Up @@ -256,6 +259,9 @@ impl Codegen<'_> {
if build_inputs {
write_inputs(&mut self.out, &self.inputs.build_inputs, "buildInputs")?;
}
if check_inputs {
write_inputs(&mut self.out, &self.inputs.check_inputs, "checkInputs")?;
}
write!(self.out, "{after_inputs}")?;

if !self.inputs.env.is_empty() {
Expand Down Expand Up @@ -473,6 +479,7 @@ impl SourceLayout {
has_cargo_lock: src_dir.join("Cargo.lock").is_file(),
has_cmake: src_dir.join("CMakeLists.txt").is_file(),
has_go: src_dir.join("go.mod").is_file(),
has_dune: src_dir.join("dune-project").is_file(),
has_meson: src_dir.join("meson.build").is_file(),
has_npm: src_dir.join("package.json").is_file(),
has_npm_lock: src_dir.join("package-lock.json").is_file()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
source: src/codegen/dune.rs
expression: generate_dune(true).await
---
{
lib,
buildDunePackage,
fetchFromGitHub,
ocamlPackages,
nix-update-script,
}:

buildDunePackage (finalAttrs: {
pname = "ocaml-lsp";
version = "1.27.0";
__structuredAttrs = true;

src = src;

nativeBuildInputs = [
ocamlPackages.cinaps
];

buildInputs = [
ocamlPackages.astring
ocamlPackages.base
ocamlPackages.camlp-streams
ocamlPackages.chrome-trace
ocamlPackages.csexp
ocamlPackages.dune-build-info
ocamlPackages.dune-rpc
ocamlPackages.dyn
ocamlPackages.fiber
ocamlPackages.jsonrpc
ocamlPackages.lsp
ocamlPackages.merlin-lib
ocamlPackages.ocamlc-loc
ocamlPackages.ocamlformat-rpc-lib
ocamlPackages.ordering
ocamlPackages.pp
ocamlPackages.ppx_yojson_conv_lib
ocamlPackages.re
ocamlPackages.spawn
ocamlPackages.stdune
ocamlPackages.uutf
ocamlPackages.xdg
ocamlPackages.yojson
];

checkInputs = [
ocamlPackages.cinaps
ocamlPackages.ocamlformat
ocamlPackages.ppx_expect
];

passthru.updateScript = nix-update-script { };

meta = {
description = "LSP Server for OCaml";
homepage = "https://github.com/ocaml/ocaml-lsp";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ alice ];
mainProgram = "ocaml-lsp";
};
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
---
source: src/codegen/dune.rs
expression: generate_dune(false).await
---
{
lib,
buildDunePackage,
fetchFromGitHub,
ocamlPackages,
nix-update-script,
}:

buildDunePackage (finalAttrs: {
pname = "ocaml-lsp";
version = "1.27.0";
__structuredAttrs = true;

src = src;

buildInputs = [
ocamlPackages.astring
ocamlPackages.base
ocamlPackages.camlp-streams
ocamlPackages.chrome-trace
ocamlPackages.csexp
ocamlPackages.dune-build-info
ocamlPackages.dune-rpc
ocamlPackages.dyn
ocamlPackages.fiber
ocamlPackages.jsonrpc
ocamlPackages.lsp
ocamlPackages.merlin-lib
ocamlPackages.ocamlc-loc
ocamlPackages.ocamlformat-rpc-lib
ocamlPackages.ordering
ocamlPackages.pp
ocamlPackages.ppx_yojson_conv_lib
ocamlPackages.re
ocamlPackages.spawn
ocamlPackages.stdune
ocamlPackages.xdg
ocamlPackages.yojson
];

checkInputs = [
ocamlPackages.ocamlformat
ocamlPackages.ppx_expect
];

passthru.updateScript = nix-update-script { };

meta = {
description = "LSP Server for OCaml";
homepage = "https://github.com/ocaml/ocaml-lsp";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ alice ];
mainProgram = "ocaml-lsp";
};
})
6 changes: 4 additions & 2 deletions src/inputs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use anyhow::Result;
pub struct AllInputs {
pub native_build_inputs: Inputs,
pub build_inputs: Inputs,
pub check_inputs: Inputs,
pub env: BTreeMap<Cow<'static, str>, (Cow<'static, str>, Vec<String>)>,
}

Expand All @@ -30,15 +31,16 @@ pub fn write_all_lambda_inputs(
out: &mut impl Write,
inputs: &AllInputs,
written: &mut BTreeSet<String>,
) -> Result<(bool, bool)> {
) -> Result<(bool, bool, bool)> {
let native_build_inputs = write_lambda_inputs(out, written, &inputs.native_build_inputs)?;
let build_inputs = write_lambda_inputs(out, written, &inputs.build_inputs)?;
let check_inputs = write_lambda_inputs(out, written, &inputs.check_inputs)?;
for input in inputs.env.values().flat_map(|(_, inputs)| inputs) {
if written.insert(input.clone()) {
writeln!(out, " {input},")?;
}
}
Ok((native_build_inputs, build_inputs))
Ok((native_build_inputs, build_inputs, check_inputs))
}

fn write_lambda_inputs(
Expand Down
Loading
Loading