pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Alyssa Ross and committed by
GitHub 77eb94fa 4b05ee3f

+17 -15
+9 -8
pkgs/development/ocaml-modules/wayland/default.nix
··· 2 2 , buildDunePackage 3 3 , fetchurl 4 4 , xmlm 5 - , lwt 5 + , eio 6 6 , logs 7 7 , fmt 8 8 , cstruct 9 9 , cmdliner 10 - , alcotest-lwt 10 + , alcotest 11 + , eio_main 11 12 }: 12 13 13 14 buildDunePackage rec { 14 15 pname = "wayland"; 15 - version = "1.1"; 16 + version = "2.0"; 16 17 17 - minimalOCamlVersion = "4.08"; 18 - duneVersion = "3"; 18 + minimalOCamlVersion = "5.0"; 19 19 20 20 src = fetchurl { 21 21 url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; 22 - sha256 = "0b7czgh08i6xcx3fsz6vd19sfyngwi0i27jdzg8cnjgrgwnagv6d"; 22 + hash = "sha256-iCG1zk1tA7gdGGt78c3sQi0NN9Fh3HsCP4cy7Y3pg0s="; 23 23 }; 24 24 25 25 propagatedBuildInputs = [ 26 - lwt 26 + eio 27 27 logs 28 28 fmt 29 29 cstruct ··· 35 35 ]; 36 36 37 37 checkInputs = [ 38 - alcotest-lwt 38 + alcotest 39 + eio_main 39 40 ]; 40 41 doCheck = true; 41 42
+5 -6
pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
··· 8 8 9 9 ocamlPackages.buildDunePackage rec { 10 10 pname = "wayland-proxy-virtwl"; 11 - version = "unstable-2023-08-13"; 11 + version = "unstable-2023-10-27"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "talex5"; 15 15 repo = pname; 16 - rev = "050c49a377808105b895e81e7e498f35cc151e58"; 17 - sha256 = "sha256-6YJv3CCED6LUSPFwYQyHUFkkvOWZGPNHVzw60b5F8+c="; 16 + rev = "cc9548c4980ff33f86d5645ce337a79bf95d6139"; 17 + sha256 = "sha256-aAqbPslTu+RLQPKPJQH2iYjcI8/De2WPk5nHULdfocU="; 18 18 }; 19 19 20 - minimalOCamlVersion = "4.12"; 21 - duneVersion = "3"; 20 + minimalOCamlVersion = "5.0"; 22 21 23 22 nativeBuildInputs = [ 24 23 pkg-config ··· 26 25 27 26 buildInputs = [ libdrm ] ++ (with ocamlPackages; [ 28 27 dune-configurator 28 + eio_main 29 29 ppx_cstruct 30 30 wayland 31 31 cmdliner 32 32 logs 33 - cstruct-lwt 34 33 ppx_cstruct 35 34 ]); 36 35
+3 -1
pkgs/top-level/all-packages.nix
··· 4800 4800 4801 4801 wayland-utils = callPackage ../tools/wayland/wayland-utils { }; 4802 4802 4803 - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; 4803 + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { 4804 + ocamlPackages = ocaml-ng.ocamlPackages_5_0; 4805 + }; 4804 4806 4805 4807 waylogout = callPackage ../tools/wayland/waylogout { }; 4806 4808