From 84595758cce3462fc08c2d3e38526b81694b55b7 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 20 Dec 2021 21:24:30 -0800 Subject: [PATCH 1/2] phoc: 0.9.0 -> 0.11.0 We can finally drop wlroots_0_12! On the other hand, we now need to keep wlroots_0_14 when 0.15 gets merged :P Removing archseer from maintainers per request: https://github.com/NixOS/nixpkgs/pull/143785#issuecomment-955873911 --- pkgs/applications/misc/phoc/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 1a590af94655b..67e7407225b86 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -26,12 +26,6 @@ let url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38"; }) - # To fix missing header `EGL/eglmesaext.h` dropped upstream - (fetchpatch { - name = "0002-stop-including-eglmesaext-h.patch"; - url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch"; - sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l"; - }) # xwayland: Allow to retrieve _NET_STARTUP_ID (fetchpatch { @@ -49,7 +43,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -57,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI="; + sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A="; }; nativeBuildInputs = [ @@ -92,7 +86,7 @@ in stdenv.mkDerivation rec { description = "Wayland compositor for mobile phones like the Librem 5"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ archseer masipcat zhaofengli ]; + maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 698b50eefdb17..fa32136848ad6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8737,7 +8737,7 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_12; + wlroots = wlroots_0_14; }; phodav = callPackage ../tools/networking/phodav { }; From 4ea6bfadfbdcf22fd4a6b939ecfc7f1f0a4b036d Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 20 Dec 2021 21:26:59 -0800 Subject: [PATCH 2/2] wlroots_0_12: drop phoc was the last package that depended on this. --- pkgs/development/libraries/wlroots/0.12.nix | 59 --------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 60 deletions(-) delete mode 100644 pkgs/development/libraries/wlroots/0.12.nix diff --git a/pkgs/development/libraries/wlroots/0.12.nix b/pkgs/development/libraries/wlroots/0.12.nix deleted file mode 100644 index c21205beabc37..0000000000000 --- a/pkgs/development/libraries/wlroots/0.12.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland -, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg -}: - -# Fixed version derivation. -# nixpkgs-update: no auto update -stdenv.mkDerivation rec { - pname = "wlroots"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "wlroots"; - rev = version; - sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; - }; - - # $out for the library and $examples for the example programs (in examples): - outputs = [ "out" "examples" ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland ]; - - buildInputs = [ - libGL wayland wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg - ]; - - mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; - - CFLAGS = "-Wno-error=deprecated-declarations"; - - postFixup = '' - # Install ALL example programs to $examples: - # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle - # screenshot output-layout multi-pointer rotation tablet touch pointer - # simple - mkdir -p $examples/bin - cd ./examples - for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - cp "$binary" "$examples/bin/wlroots-$binary" - done - ''; - - meta = with lib; { - description = "A modular Wayland compositor library"; - longDescription = '' - Pluggable, composable, unopinionated modules for building a Wayland - compositor; or about 50,000 lines of code you were going to write anyway. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa32136848ad6..29da902f8b423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26192,7 +26192,6 @@ with pkgs; }; wlroots = wlroots_0_15; - wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { inherit (xorg) xcbutilrenderutil; };