From e7b674ebe44906867a6bec50e3eaaeabe7659dfc Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 28 Sep 2025 21:26:45 -0400 Subject: [PATCH] cardboard: drop Has been marked broken for a full release cycle. Dropping per RFC 180. --- pkgs/by-name/ca/cardboard/package.nix | 146 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 146 deletions(-) delete mode 100644 pkgs/by-name/ca/cardboard/package.nix diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix deleted file mode 100644 index 2c966d891715..000000000000 --- a/pkgs/by-name/ca/cardboard/package.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchurl, - fetchgit, - ffmpeg, - libGL, - libX11, - libcap, - libdrm, - libinput, - libpng, - libxcb, - libxkbcommon, - libgbm, - meson, - ninja, - pandoc, - pixman, - pkg-config, - unzip, - wayland, - wayland-protocols, - wayland-scanner, - xcbutilerrors, - xcbutilimage, - xcbutilwm, -}: - -let - allSources = { - # cereal.wrap - cereal-wrap = fetchurl { - name = "cereal-1.3.0.tar.gz"; - url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; - hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; - }; - cereal-wrapdb = fetchurl { - name = "cereal-1.3.0-1-wrap.zip"; - url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; - hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; - }; - - # expected.wrap - expected-wrap = fetchgit { - name = "expected"; - url = "https://gitlab.com/cardboardwm/expected"; - rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; - hash = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; - }; - - # wlroots.wrap - wlroots-wrap = fetchgit { - name = "wlroots"; - url = "https://github.com/swaywm/wlroots"; - rev = "0.12.0"; - hash = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; - }; - - # the source itself - cardboard = fetchFromGitLab { - owner = "cardboardwm"; - repo = "cardboard"; - rev = "b54758d85164fb19468f5ca52588ebea576cd027"; - hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; - }; - }; -in -stdenv.mkDerivation { - pname = "cardboard"; - version = "unstable-2021-05-10"; - - src = allSources.cardboard; - - outputs = [ - "out" - "dev" - "lib" - "man" - ]; - - nativeBuildInputs = [ - meson - ninja - pandoc - pkg-config - unzip - wayland-scanner - ]; - - buildInputs = [ - ffmpeg - libGL - libX11 - libcap - libdrm - libinput - libpng - libxcb - libxkbcommon - libgbm - pixman - wayland - wayland-protocols - xcbutilerrors - xcbutilimage - xcbutilwm - ]; - - postPatch = '' - pushd subprojects - tar xvf ${allSources.cereal-wrap} - unzip ${allSources.cereal-wrapdb} - cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name} - cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name} - popd - - # gcc12 - sed '1i#include ' -i cardboard/ViewAnimation.h - ''; - - # "Inherited" from Nixpkgs expression for wlroots - mesonFlags = [ - (lib.mesonBool "man" true) - (lib.mesonOption "wlroots:logind-provider" "systemd") - (lib.mesonEnable "wlroots:libseat" false) - ]; - - # gcc12 - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; - - passthru = { - providedSessions = [ "cardboard" ]; - }; - - meta = { - broken = true; # Upstream is archived, fails to build on gcc-13. - homepage = "https://gitlab.com/cardboardwm/cardboard"; - description = "Scrollable, tiling Wayland compositor inspired on PaperWM"; - license = lib.licenses.gpl3Only; - mainProgram = "cardboard"; - maintainers = with lib.maintainers; [ ]; - inherit (wayland.meta) platforms; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9be2aa75960a..c8b1d937376c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -580,6 +580,7 @@ mapAliases { cask = emacs.pkgs.cask; # Added 2022-11-12 catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 + cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-espflash = espflash; # Added 2024-02-09 cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25