Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d6635092e57
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80bf06e78b14
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2021

  1. dune_2: 2.7.1 -> 2.8.0

    @anmonteiro @vbgl
    anmonteiro authored and vbgl committed Jan 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    80bf06e View commit details
Showing with 3 additions and 11 deletions.
  1. +3 −11 pkgs/development/tools/ocaml/dune/2.nix
14 changes: 3 additions & 11 deletions pkgs/development/tools/ocaml/dune/2.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
{ 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}"
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)" ];