Merge pull request #231256 from vbgl/ocaml-zed-dune3

ocamlPackages.{zed,charInfo_width}: use Dune 3

authored by

Ulrik Strid and committed by
GitHub
3cb5bc28 acb52d7a

+4 -4
+1 -1
pkgs/development/ocaml-modules/charInfo_width/default.nix
··· 3 buildDunePackage rec { 4 pname = "charInfo_width"; 5 version = "1.1.0"; 6 - useDune2 = true; 7 src = fetchzip { 8 url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; 9 sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";
··· 3 buildDunePackage rec { 4 pname = "charInfo_width"; 5 version = "1.1.0"; 6 + duneVersion = "3"; 7 src = fetchzip { 8 url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; 9 sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";
+3 -3
pkgs/development/ocaml-modules/zed/default.nix
··· 7 { 8 version = "3.2.0"; 9 sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; 10 - duneVersion = "3"; 11 propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; 12 } 13 else 14 { 15 version = "3.1.0"; 16 sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; 17 - duneVersion = "2"; 18 propagatedBuildInputs = [ charInfo_width react ]; 19 }; 20 in ··· 22 buildDunePackage rec { 23 pname = "zed"; 24 25 - inherit (switch) version duneVersion propagatedBuildInputs; 26 27 src = fetchFromGitHub { 28 owner = "ocaml-community";
··· 7 { 8 version = "3.2.0"; 9 sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; 10 propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; 11 } 12 else 13 { 14 version = "3.1.0"; 15 sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; 16 propagatedBuildInputs = [ charInfo_width react ]; 17 }; 18 in ··· 20 buildDunePackage rec { 21 pname = "zed"; 22 23 + inherit (switch) version propagatedBuildInputs; 24 + 25 + duneVersion = "3"; 26 27 src = fetchFromGitHub { 28 owner = "ocaml-community";