Unverified Commit a5e6944c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

dune_1: remove (#461177)

parents 99fdca17 73148671

doc/languages-frameworks/ocaml.section.md

+6 −6
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ Here is a simple package example. 


- It uses the `fetchFromGitHub` fetcher to get its source.



- It also accepts a `duneVersion` parameter (valid values are `"1"`, `"2"`, and

  `"3"`). The recommended practice is to set it only if you don't want the default

  value and/or it depends on something else like package version. You might see

  a not-supported argument `useDune2`. The behavior was `useDune2 = true;` =>

  `duneVersion = "2";` and `useDune2 = false;` => `duneVersion = "1";`. It was

  used at the time when dune3 didn't exist.

- It also accepts a `duneVersion` parameter (valid values are `"2"`, and

  `"3"`). The recommended practice is to set it only if you don't want the

  default value and/or it depends on something else like package version. You

  might see a not-supported argument `useDune2`. The behavior was `useDune2 =

  true;` => `duneVersion = "2";` and `useDune2 = false;` => `duneVersion =

  "1";`. It was used at the time when dune3 didn't exist.



- It sets the optional `doCheck` attribute such that tests will be run with

  `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is

pkgs/build-support/ocaml/dune.nix

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  ocaml,

  findlib,

  dune_1,

  dune_2,

  dune_3,

}:
@@ -30,7 +29,7 @@ lib.extendMkDerivation { 
          dune-version = args.duneVersion or "3";

        in

        {

          "1" = dune_1;

          "1" = throw "Support for dune version 1 has been removed";

          "2" = dune_2;

          "3" = dune_3;

        }

pkgs/development/tools/ocaml/dune/1.nix

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  fetchurl,

  ocaml,

  findlib,

  ncurses,

}:



stdenv.mkDerivation rec {

  pname = "dune";

  version = "1.11.4";

  src = fetchurl {

    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";

    sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp";

  };



  nativeBuildInputs = [

    ocaml

    findlib

  ];

  buildInputs = [ ncurses ];

  strictDeps = true;



  buildFlags = [ "release" ];

  makeFlags = [

    "PREFIX=${placeholder "out"}"

    "LIBDIR=$(OCAMLFIND_DESTDIR)"

  ];



  dontAddPrefix = true;

  dontAddStaticConfigureFlags = true;

  configurePlatforms = [ ];



  meta = with lib; {

    homepage = "https://dune.build/";

    description = "Composable build system";

    maintainers = [ maintainers.vbgl ];

    license = licenses.mit;

    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12";

    inherit (ocaml.meta) platforms;

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ mapAliases { 
  duckstation-bin = duckstation; # Added 2025-09-20

  dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14

  dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27

  dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13

  eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27

  easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17

  EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -1899,7 +1899,6 @@ with pkgs; 


  inherit (ocamlPackages) dot-merlin-reader;



  inherit (ocaml-ng.ocamlPackages_4_10) dune_1;

  inherit (ocamlPackages) dune_2 dune_3 dune-release;



  dvc = with python3.pkgs; toPythonApplication dvc;