diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-31 12:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 12:01:11 +0000 |
| commit | 2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea (patch) | |
| tree | 0819b18b40dde68605e6ef74185ce789ce3e0d70 /pkgs/tools/wayland | |
| parent | 97868dae8e43d4d915e232649acf575bad87e0f6 (diff) | |
| parent | 2a3e5c787282bad03fe143e20021dbc1613e5476 (diff) | |
| download | nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar.gz nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar.bz2 nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar.lz nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar.xz nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.tar.zst nixpkgs-2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/wayland')
| -rw-r--r-- | pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/wayland/wl-mirror/default.nix | 4 |
2 files changed, 7 insertions, 8 deletions
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/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 0746dd5ff09..eaaec0f0bb2 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-dmdRe4GZ1W2gD7ZF1MudBqfZIm9HyBjISa+xB54BLz4="; + hash = "sha256-dEkTRpeJhqUGDCqTLVsFoDXgHvfEqMYt/9DEldjqv0Y="; }; strictDeps = true; |