summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml/dune
diff options
context:
space:
mode:
authorAntonio Nuno Monteiro <anmonteiro@gmail.com>2021-01-13 14:43:47 -0800
committerVincent Laporte <vbgl@users.noreply.github.com>2021-01-19 15:15:02 +0100
commit80bf06e78b1488bccb1c34602e42a6f10131e00c (patch)
tree37d1f53089f60aeb3799e3c7469e3a364fb81dea /pkgs/development/tools/ocaml/dune
parent9d6635092e573b0fe6514c0817a92f44ba1c1ec1 (diff)
downloadnixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar.gz
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar.bz2
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar.lz
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar.xz
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.tar.zst
nixpkgs-80bf06e78b1488bccb1c34602e42a6f10131e00c.zip
dune_2: 2.7.1 -> 2.8.0
Diffstat (limited to 'pkgs/development/tools/ocaml/dune')
-rw-r--r--pkgs/development/tools/ocaml/dune/2.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 177fa96f5b9..8183e106aa7 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, fetchpatch }:
+{ stdenv, fetchurl, ocaml, findlib }:
 
 if stdenv.lib.versionOlder ocaml.version "4.08"
 then throw "dune is not available for OCaml ${ocaml.version}"
@@ -6,25 +6,17 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3";
+    sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407";
   };
 
   buildInputs = [ ocaml findlib ];
 
   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;
 
   installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];