public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dune_2: 2.7.0 -> 2.7.1 

https://github.com/ocaml/dune/releases/tag/2.7.1
This commit is contained in:
Mario Rodas 2020-09-02 19:01:00 -05:00 committed by Vincent Laporte
parent cadc15222f
commit c7e8da6225
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/dune-action-plugin/default.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "dune-action-plugin"; pname = "dune-action-plugin";
inherit (dune_2) src version; inherit (dune_2) src version patches;
useDune2 = true; useDune2 = true;

2
pkgs/development/ocaml-modules/dune-build-info/default.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "dune-build-info"; pname = "dune-build-info";
inherit (dune_2) src version; inherit (dune_2) src version patches;
useDune2 = true; useDune2 = true;

6
pkgs/development/ocaml-modules/dune-configurator/default.nix
View File

@ -1,15 +1,15 @@
{ lib, buildDunePackage, dune_2, dune-private-libs }: { lib, buildDunePackage, dune_2, csexp, result }:
buildDunePackage rec { buildDunePackage rec {
pname = "dune-configurator"; pname = "dune-configurator";
useDune2 = true; useDune2 = true;
inherit (dune_2) src version; inherit (dune_2) src version patches;
dontAddPrefix = true; dontAddPrefix = true;
propagatedBuildInputs = [ dune-private-libs ]; propagatedBuildInputs = [ csexp result ];
meta = with lib; { meta = with lib; {
description = "Helper library for gathering system configuration"; description = "Helper library for gathering system configuration";

2
pkgs/development/ocaml-modules/dune-glob/default.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "dune-glob"; pname = "dune-glob";
inherit (dune_2) src version; inherit (dune_2) src version patches;
useDune2 = true; useDune2 = true;

2
pkgs/development/ocaml-modules/dune-private-libs/default.nix
View File

@ -5,7 +5,7 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
inherit (dune_2) src version; inherit (dune_2) src version patches;
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";

14
pkgs/development/tools/ocaml/dune/2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib }: { stdenv, fetchurl, ocaml, findlib, fetchpatch }:
if stdenv.lib.versionOlder ocaml.version "4.08" if stdenv.lib.versionOlder ocaml.version "4.08"
then throw "dune is not available for OCaml ${ocaml.version}" then throw "dune is not available for OCaml ${ocaml.version}"
@ -6,17 +6,25 @@ else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dune"; pname = "dune";
version = "2.7.0"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl"; sha256 = "0lnfmc06yhbdiv6mmp0aksnnvzz4aw4zabrdg89p5msyzir3qrvn";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
buildFlags = "release"; buildFlags = "release";
patches = [
# Fix setup.ml configure path. Remove with the next release.
(fetchpatch {
url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch";
sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28";
})
];
dontAddPrefix = true; dontAddPrefix = true;
installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];