diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-31 09:51:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 09:51:22 +0100 |
| commit | 77eb94fa5c5ef665763d36ae5c5fea4b682c4353 (patch) | |
| tree | ca84f978715545ccb9e831dbcae7e22828185b42 | |
| parent | 4b05ee3f056ae098eba6a4152bcc45098d0d6abf (diff) | |
| download | nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar.gz nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar.bz2 nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar.lz nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar.xz nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.tar.zst nixpkgs-77eb94fa5c5ef665763d36ae5c5fea4b682c4353.zip | |
wayland-proxy-virtwl: unstable-2023-08-13 -> unstable-2023-10-27 (#264161)
* ocamlPackages.wayland: 1.1 -> 2.0 * wayland-proxy-virtwl: unstable-2023-08-13 -> unstable-2023-10-27
| -rw-r--r-- | pkgs/development/ocaml-modules/wayland/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 9dea4a64a50..6c60458f966 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -2,28 +2,28 @@ , buildDunePackage , fetchurl , xmlm -, lwt +, eio , logs , fmt , cstruct , cmdliner -, alcotest-lwt +, alcotest +, eio_main }: buildDunePackage rec { pname = "wayland"; - version = "1.1"; + version = "2.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; - sha256 = "0b7czgh08i6xcx3fsz6vd19sfyngwi0i27jdzg8cnjgrgwnagv6d"; + hash = "sha256-iCG1zk1tA7gdGGt78c3sQi0NN9Fh3HsCP4cy7Y3pg0s="; }; propagatedBuildInputs = [ - lwt + eio logs fmt cstruct @@ -35,7 +35,8 @@ buildDunePackage rec { ]; checkInputs = [ - alcotest-lwt + alcotest + eio_main ]; doCheck = true; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 25123ec9b24..4e829d1e0b6 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,17 +8,16 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2023-08-13"; + version = "unstable-2023-10-27"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "050c49a377808105b895e81e7e498f35cc151e58"; - sha256 = "sha256-6YJv3CCED6LUSPFwYQyHUFkkvOWZGPNHVzw60b5F8+c="; + rev = "cc9548c4980ff33f86d5645ce337a79bf95d6139"; + sha256 = "sha256-aAqbPslTu+RLQPKPJQH2iYjcI8/De2WPk5nHULdfocU="; }; - minimalOCamlVersion = "4.12"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; nativeBuildInputs = [ pkg-config @@ -26,11 +25,11 @@ ocamlPackages.buildDunePackage rec { buildInputs = [ libdrm ] ++ (with ocamlPackages; [ dune-configurator + eio_main ppx_cstruct wayland cmdliner logs - cstruct-lwt ppx_cstruct ]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0fac3d668d..77aaee8aa69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4800,7 +4800,9 @@ with pkgs; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { + ocamlPackages = ocaml-ng.ocamlPackages_5_0; + }; waylogout = callPackage ../tools/wayland/waylogout { }; |