Unverified Commit 77eb94fa authored by Alyssa Ross's avatar Alyssa Ross Committed by GitHub
Browse files

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
parent 4b05ee3f

pkgs/development/ocaml-modules/wayland/default.nix

+9 −8
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/wayland/wayland-proxy-virtwl/default.nix

+5 −6
Original line number Diff line number Diff line
@@ -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

  ]);

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };