nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 00:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.base_0_12: Add dune_1 to build inputs for dune.configurator

Browse Source 
Co-authored-by: vbgl
This commit is contained in:
Ulrik Strid
2022-03-03 15:16:56 +01:00
committed by Vincent Laporte
parent b80a39b91b
commit ffa377b626
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/janestreet/0.12.nix
View File

@@ -24,7 +24,7 @@ with self;
hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri";
meta.description = "Full standard library replacement for OCaml";
propagatedBuildInputs = [ sexplib0 ];
buildInputs = [ dune-configurator ];
buildInputs = [ dune_1 ];
};
stdio = janePackage {
@@ -208,7 +208,7 @@ with self;
pname = "jst-config";
hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93";
meta.description = "Compile-time configuration for Jane Street libraries";
buildInputs = [ ppx_assert ];
buildInputs = [ dune_1 ppx_assert ];
};
ppx_optcomp = janePackage {

8
pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
View File

@@ -1,13 +1,11 @@
{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }:
{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args:
{ pname, version ? defaultVersion, hash, ...}@args:
buildDunePackage (args // {
inherit version buildInputs;
inherit version;
minimumOCamlVersion = "4.07";
useDune2 = true;
minimalOCamlVersion = "4.07";
src = fetchFromGitHub {
owner = "janestreet";