From b053d853fa998335c9489c9b7d7bb6d4ed31a696 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Fri, 7 Nov 2025 11:23:50 -0500 Subject: [PATCH 1/2] libevdevplus: drop --- .../0001-Add-cmake-install-directives.patch | 41 ------------------- pkgs/by-name/li/libevdevplus/package.nix | 36 ---------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch delete mode 100644 pkgs/by-name/li/libevdevplus/package.nix diff --git a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index 2635d6ab829e..000000000000 --- a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster -Date: Fri, 2 Apr 2021 16:01:05 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please add them. ---- - CMakeLists.txt | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9db618..425d391 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,10 +4,17 @@ project(libevdevPlus) - set(SOURCE_FILES - evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp) - -+include(GNUInstallDirs) -+ - add_library(evdevPlus ${SOURCE_FILES}) - target_include_directories(evdevPlus PUBLIC .) - - add_executable(evdevPlus_test test.cpp) - target_link_libraries(evdevPlus_test evdevPlus) - --configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -\ No newline at end of file -+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -+ -+install(TARGETS evdevPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp -+ DESTINATION include/) --- -2.29.2 - diff --git a/pkgs/by-name/li/libevdevplus/package.nix b/pkgs/by-name/li/libevdevplus/package.nix deleted file mode 100644 index c89d7faa7865..000000000000 --- a/pkgs/by-name/li/libevdevplus/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "libevdevplus"; - version = "unstable-2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libevdevPlus/pull/10 - patches = [ ./0001-Add-cmake-install-directives.patch ]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libevdevPlus"; - rev = "b4d4b3143056424a3da9f0516ca02a47209ef757"; - sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use event device library in C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7f758a78104..11fa2596113d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 + libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04 libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 From 45bcb14f4b45ca94b6cde071186c5b5b2a0d5587 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 2 Nov 2025 20:46:59 -0600 Subject: [PATCH 2/2] libuinputplus: drop --- .../0001-Add-cmake-install-directives.patch | 40 ------------------- pkgs/by-name/li/libuinputplus/package.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch delete mode 100644 pkgs/by-name/li/libuinputplus/package.nix diff --git a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index cd6f43d37705..000000000000 --- a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster -Date: Fri, 2 Apr 2021 16:33:18 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please consider adding them. ---- - CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbfc9c1..948c432 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(SOURCE_FILES - uInput.cpp uInputSetup.cpp uInputResource.cpp - uInput.hpp CommonIncludes.hpp uInputSetup.hpp) - -+include(GNUInstallDirs) -+ - add_library(uInputPlus ${SOURCE_FILES}) - target_include_directories(uInputPlus PUBLIC .) - -@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus) - - configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY) - -+ -+install(TARGETS uInputPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp -+ DESTINATION include/) -+ --- -2.29.2 - diff --git a/pkgs/by-name/li/libuinputplus/package.nix b/pkgs/by-name/li/libuinputplus/package.nix deleted file mode 100644 index 1541a52b32a7..000000000000 --- a/pkgs/by-name/li/libuinputplus/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, -}: -stdenv.mkDerivation rec { - pname = "libuinputplus"; - version = "2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libuInputPlus/pull/7 - patches = [ ./0001-Add-cmake-install-directives.patch ]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libuInputPlus"; - rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957"; - sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use uinput library in C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 11fa2596113d..530ab4fe1483 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -827,6 +827,7 @@ mapAliases { libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10 libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 + libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27 lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27