From bbbfa77f0b0a334cf29bbdf62f53df533ae315fb Mon Sep 17 00:00:00 2001 From: Jappie3 Date: Tue, 3 Feb 2026 22:33:46 +0100 Subject: [PATCH] webmacs: drop --- .../networking/browsers/webmacs/default.nix | 79 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/webmacs/default.nix diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix deleted file mode 100644 index a3816002a53b..000000000000 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - mkDerivationWith, - fetchFromGitHub, - python3Packages, - herbstluftwm, -}: - -mkDerivationWith (python3Packages.buildPythonApplication.override { inherit stdenv; }) rec { - pname = "webmacs"; - version = "0.8"; - format = "setuptools"; - - disabled = python3Packages.isPy27; - - src = fetchFromGitHub { - owner = "parkouss"; - repo = "webmacs"; - rev = version; - fetchSubmodules = true; - sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368"; - }; - - propagatedBuildInputs = with python3Packages; [ - pyqtwebengine - setuptools - dateparser - jinja2 - pygments - ]; - - nativeCheckInputs = [ - python3Packages.pytest - #python3Packages.pytest-xvfb - #python3Packages.pytest-qt - python3Packages.pytestCheckHook - herbstluftwm - - # The following are listed in test-requirements.txt but appear not - # to be needed at present: - - # python3Packages.pytest-mock - # python3Packages.flake8 - ]; - - # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32 - # Don't know why they're using CC for g++. - preConfigure = '' - export CC=$CXX - ''; - - doCheck = false; # test dependencies not packaged up yet - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - meta = { - description = "Keyboard-based web browser with Emacs/conkeror heritage"; - mainProgram = "webmacs"; - longDescription = '' - webmacs is yet another browser for keyboard-based web navigation. - - It mainly targets emacs-like navigation, and started as a clone (in terms of - features) of conkeror. - - Based on QtWebEngine and Python 3. Fully customizable in Python. - ''; - homepage = "https://webmacs.readthedocs.io/en/latest/"; - changelog = "https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ jacg ]; - platforms = lib.platforms.all; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 309fcbee2c81..2d27e9697215 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1874,6 +1874,7 @@ mapAliases { webfontkitgenerator = webfont-bundler; # Added 2025-07-27 webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11 webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08 + webmacs = throw "webmacs has been removed as it was unmaintained upstream"; # Added 2026-02-03 welkin = throw "welkin was removed as it is unmaintained upstream"; # Added 2026-01-01 whatsapp-for-linux = throw "'whatsapp-for-linux' has been renamed to/replaced by 'wasistlos'"; # Converted to throw 2025-10-27 wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9c943df90e8..f4731b6d7e76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11495,10 +11495,6 @@ with pkgs; webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { - stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; - }; - webssh = with python3Packages; toPythonApplication webssh; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };