From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 5BD2172407; Fri, 30 Sep 2022 21:13:10 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id C979672403; Fri, 30 Sep 2022 21:13:07 +0000 (UTC) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by atuin.qyliss.net (Postfix) with ESMTPS id 4319372402 for ; Fri, 30 Sep 2022 21:13:06 +0000 (UTC) Received: by mail-ed1-x52b.google.com with SMTP id z97so7520284ede.8 for ; Fri, 30 Sep 2022 14:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=y5RBmr5OZLxR12Iu3E51DTLGaOxoNfLz386+5XuHgFo=; b=VE2kVVj9wbIxJRg3yUra4nNfl9IDQ3b4XB2vhMdeFNIjttP/T2PSdZoJiQn1WJwmSI Eear1tvY52XG1OsZxdvHiFFhCxzBE6OZB98nPhBVl9B7P7QPYor9T3hU4na5iVOzht9a 6GhDK8ukGCHP2000GYR9m3ZQAn67dNsP1IZsntdsMaT0in8VUS7fgLSRhELWVu80zZTS Towj4UwhzKRX/7AIUkt4Tx5rtsw2sUfRNR0j1D1MolI4AGKKZasn67+Rk3RiP7qMlYZv wL82XbXCWoTuJEOv7wVpC8wcc+smmZj4gn8iz6zJtpdApSDf5o9ag9EJA1G5KD9E9aUv DKdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=y5RBmr5OZLxR12Iu3E51DTLGaOxoNfLz386+5XuHgFo=; b=ylvo0h2sQuD0HqaMj1wCUI/6SaAqk20xAR0lwIywemrio7nSf8M2evpURjsIXEQg9M G1srpxvfkcn0ExqoMLqZ8N3KiEl8m1/V99btKBrzMkKqfUqkAm0XTr7Gvu8XobmRmMnZ VFwRnsObHLGI1iNzCs8xmIYd+mHz4NP8ESo7Md3zOFjpJT1XaZ830ZXwFVQmf/tc4/9x 1/CXVqHoiF0YhQSDD2Fd6qG6z3gde6ygLX0wDTc/cnxecG9HL7Yenl6zLndRWPCRJLF3 q+MfUh0Yz78JB84JGGwm/dgL5aAMejZF1FPPDRj0ouHL9mbTm1GQ4hoCI8FaCyi1L05s A26g== X-Gm-Message-State: ACrzQf3RqDGbPPoMEgEQOyHBmVKf3iRUciZwLC0f5WDTr5qI3B/1kRrh h/6Wp2oinhYJy5IIRQuLlIwhEAib7vTLU2WO X-Google-Smtp-Source: AMsMyM64s1KuHZmu/cWKKInl1jcj4ty64yNgAPHwos49Kqzhat0GVKuc6VCLoh9Y3yDMBsL/ObH82A== X-Received: by 2002:a50:9344:0:b0:448:ce76:7c81 with SMTP id n4-20020a509344000000b00448ce767c81mr9369601eda.187.1664572385878; Fri, 30 Sep 2022 14:13:05 -0700 (PDT) Received: from x220.qyliss.net (p200300ed67079c010000000000000003.dip0.t-ipconnect.de. [2003:ed:6707:9c01::3]) by smtp.gmail.com with ESMTPSA id d10-20020a170906304a00b0073d5948855asm1510902ejd.1.2022.09.30.14.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 14:13:05 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id EFE56687; Fri, 30 Sep 2022 21:13:04 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs v2 9/9] wayland-proxy-virtwl: unstable-2021-12-05 -> unstable-2022-09-22 Date: Fri, 30 Sep 2022 21:12:45 +0000 Message-Id: <20220930211245.1699375-1-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220930210906.1696349-1-alyssa.ross@unikie.com> References: <20220930210906.1696349-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: YF3SWRHCY7EEPPKJYDA2PGMELJBECMJV X-Message-ID-Hash: YF3SWRHCY7EEPPKJYDA2PGMELJBECMJV X-MailFrom: alyssa.ross@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Puck Meerburg , Ville Ilvonen , sternenseemann X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: sternenseemann Co-authored-by: Alyssa Ross (cherry picked from commit 5cac465ec618cdc6e9077b447b4a5b138e482ddb) Signed-off-by: Alyssa Ross --- .../wayland/wayland-proxy-virtwl/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 8c7708c3e3d..3931fe9c3da 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -1,17 +1,19 @@ { lib , fetchFromGitHub , ocamlPackages +, pkg-config +, libdrm }: ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2021-12-05"; + version = "unstable-2022-09-22"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885"; - sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s"; + rev = "5940346db2a4427f21c7b30a2593b179af36a935"; + sha256 = "0jnr5q52nb3yqr7ykvvb902xsad24cdi9imkslcsa5cnzb4095rw"; }; postPatch = '' @@ -19,21 +21,22 @@ ocamlPackages.buildDunePackage rec { rm -r ocaml-wayland ''; - useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; strictDeps = true; nativeBuildInputs = [ ocamlPackages.ppx_cstruct + pkg-config ]; - buildInputs = with ocamlPackages; [ + buildInputs = [ libdrm ] ++ (with ocamlPackages; [ + dune-configurator wayland cmdliner logs cstruct-lwt ppx_cstruct - ]; + ]); doCheck = true; -- 2.37.1