pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #210884 from vbgl/beluga-dune-3

Use dune 3 for a few OCaml tools

authored by Weijia Wang and committed by GitHub c5460eb4 6c95eb5e

+13 -9
unified split
+1 -1
pkgs/applications/misc/orpie/default.nix
··· 4 pname = "orpie"; 5 version = "1.6.1"; 6 7 - useDune2 = true; 8 9 src = fetchFromGitHub { 10 owner = "pelzlpj";
··· 4 pname = "orpie"; 5 version = "1.6.1"; 6 7 + duneVersion = "3"; 8 9 src = fetchFromGitHub { 10 owner = "pelzlpj";
+1 -1
pkgs/applications/science/logic/anders/default.nix
··· 4 pname = "anders"; 5 version = "1.1.1"; 6 7 - useDune2 = true; 8 9 src = fetchFromGitHub { 10 owner = "groupoid";
··· 4 pname = "anders"; 5 version = "1.1.1"; 6 7 + duneVersion = "3"; 8 9 src = fetchFromGitHub { 10 owner = "groupoid";
+1 -1
pkgs/applications/science/logic/beluga/default.nix
··· 11 sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; 12 }; 13 14 - useDune2 = true; 15 16 buildInputs = with ocamlPackages; [ 17 gen sedlex extlib dune-build-info linenoise
··· 11 sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; 12 }; 13 14 + duneVersion = "3"; 15 16 buildInputs = with ocamlPackages; [ 17 gen sedlex extlib dune-build-info linenoise
+1 -1
pkgs/development/tools/ocaml/obelisk/default.nix
··· 3 ocamlPackages.buildDunePackage rec { 4 pname = "obelisk"; 5 version = "0.6.0"; 6 - useDune2 = true; 7 src = fetchFromGitHub { 8 owner = "Lelio-Brun"; 9 repo = pname;
··· 3 ocamlPackages.buildDunePackage rec { 4 pname = "obelisk"; 5 version = "0.6.0"; 6 + duneVersion = "3"; 7 src = fetchFromGitHub { 8 owner = "Lelio-Brun"; 9 repo = pname;
+5 -1
pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
··· 1 { lib 2 , fetchFromGitHub 3 , buildDunePackage 4 , fix 5 , menhirLib ··· 7 , gitUpdater 8 }: 9 10 buildDunePackage rec { 11 pname = "ocaml-recovery-parser"; 12 version = "0.2.4"; 13 14 minimalOCamlVersion = "4.08"; 15 - useDune2 = true; 16 17 src = fetchFromGitHub { 18 owner = "serokell";
··· 1 { lib 2 , fetchFromGitHub 3 + , ocaml 4 , buildDunePackage 5 , fix 6 , menhirLib ··· 8 , gitUpdater 9 }: 10 11 + lib.throwIf (lib.versionAtLeast ocaml.version "5.0") 12 + "ocaml-recovery-parser is not available for OCaml ${ocaml.version}" 13 + 14 buildDunePackage rec { 15 pname = "ocaml-recovery-parser"; 16 version = "0.2.4"; 17 18 minimalOCamlVersion = "4.08"; 19 + duneVersion = "3"; 20 21 src = fetchFromGitHub { 22 owner = "serokell";
+1 -1
pkgs/development/tools/ocaml/opam/installer.nix
··· 3 ocamlPackages.buildDunePackage { 4 pname = "opam-installer"; 5 6 - useDune2 = true; 7 8 inherit (opam) version src; 9 nativeBuildInputs = [ unzip ];
··· 3 ocamlPackages.buildDunePackage { 4 pname = "opam-installer"; 5 6 + duneVersion = "3"; 7 8 inherit (opam) version src; 9 nativeBuildInputs = [ unzip ];
+3 -3
pkgs/tools/typesetting/satysfi/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages 2 , ipaexfont, junicode, lmodern, lmmath 3 }: 4 let ··· 28 rev = "v1.4.2+satysfi"; 29 sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; 30 }; 31 - useDune2 = true; 32 nativeBuildInputs = [ ocamlPackages.cppo ]; 33 propagatedBuildInputs = [ ocamlPackages.biniou ]; 34 inherit (ocamlPackages.yojson) meta; ··· 53 54 DUNE_PROFILE = "release"; 55 56 - nativeBuildInputs = [ ruby dune_2 ]; 57 58 buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ 59 ocaml findlib menhir menhirLib
··· 1 + { lib, stdenv, fetchFromGitHub, ruby, dune_3, ocamlPackages 2 , ipaexfont, junicode, lmodern, lmmath 3 }: 4 let ··· 28 rev = "v1.4.2+satysfi"; 29 sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; 30 }; 31 + duneVersion = "3"; 32 nativeBuildInputs = [ ocamlPackages.cppo ]; 33 propagatedBuildInputs = [ ocamlPackages.biniou ]; 34 inherit (ocamlPackages.yojson) meta; ··· 53 54 DUNE_PROFILE = "release"; 55 56 + nativeBuildInputs = [ ruby dune_3 ]; 57 58 buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ 59 ocaml findlib menhir menhirLib