diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-05-11 13:14:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-11 13:14:52 +0200 |
| commit | 3cb5bc287d4b270c97797f38d3bd2d8aa229eac1 (patch) | |
| tree | cbae5cad8ff77ea852b70403d0bf72976894e44c /pkgs | |
| parent | acb52d7ad0984ae672cb076447f158182556e98e (diff) | |
| parent | ff82756d5368f84a90d6045a35ac31431745219c (diff) | |
| download | nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar.gz nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar.bz2 nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar.lz nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar.xz nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.tar.zst nixlib-3cb5bc287d4b270c97797f38d3bd2d8aa229eac1.zip | |
Merge pull request #231256 from vbgl/ocaml-zed-dune3
ocamlPackages.{zed,charInfo_width}: use Dune 3Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/charInfo_width/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/zed/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index 5b9814cea69a..aaf181104548 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; - useDune2 = true; + duneVersion = "3"; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index db9efd22749f..2922a57244b9 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -7,14 +7,12 @@ let { version = "3.2.0"; sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; - duneVersion = "3"; propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; } else { version = "3.1.0"; sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; - duneVersion = "2"; propagatedBuildInputs = [ charInfo_width react ]; }; in @@ -22,7 +20,9 @@ in buildDunePackage rec { pname = "zed"; - inherit (switch) version duneVersion propagatedBuildInputs; + inherit (switch) version propagatedBuildInputs; + + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-community"; |