From 045b226dfb16ecefa3833bfa12d481f5ec0ed078 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 12 Jan 2026 15:48:55 +0100 Subject: [PATCH] xcb-util-cursor-HEAD: drop and warnAlias to libxcb-cursor --- pkgs/by-name/an/anki-bin/package.nix | 2 +- .../libraries/xcb-util-cursor/HEAD.nix | 58 ------ .../xcb-util-cursor/m4/ax_compare_version.m4 | 174 ------------------ .../xcb-util-cursor/m4/xcb_util_common.m4 | 44 ----- .../m4/xcb_util_m4_with_include_path.m4 | 24 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 +- 7 files changed, 3 insertions(+), 305 deletions(-) delete mode 100644 pkgs/development/libraries/xcb-util-cursor/HEAD.nix delete mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 delete mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 delete mode 100644 pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index 1d99a55fff75..d16f39ecd09a 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -95,7 +95,7 @@ let (with pkgs; [ xorg.libxkbfile xorg.libxshmfence - xcb-util-cursor-HEAD + libxcb-cursor krb5 zstd ]); diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix deleted file mode 100644 index d5a2c74d1310..000000000000 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoconf, - automake, - libtool, - pkg-config, - xorg, - gnum4, - libxcb, - gperf, -}: - -stdenv.mkDerivation { - pname = "xcb-util-cursor-0.1.1-3-unstable"; - version = "2017-04-05"; - - src = fetchgit { - url = "http://anongit.freedesktop.org/git/xcb/util-cursor.git"; - rev = "f03cc278c6cce0cf721adf9c3764d3c5fba63392"; - sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc"; - }; - - meta = { - description = "XCB cursor library (libxcursor port)"; - homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lovek323 ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - autoconf - automake - pkg-config - ]; - buildInputs = [ - gnum4 - gperf - libtool - libxcb - xorg.utilmacros - xorg.xcbutilimage - xorg.xcbutilrenderutil - ]; - - configurePhase = '' - sed -i '15 i\ - LT_INIT' configure.ac - ${stdenv.shell} autogen.sh --prefix="$out" - ''; -} diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 deleted file mode 100644 index e22b50fd9fdc..000000000000 --- a/pkgs/development/libraries/xcb-util-cursor/m4/ax_compare_version.m4 +++ /dev/null @@ -1,174 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_compare_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# This macro compares two version strings. Due to the various number of -# minor-version numbers that can exist, and the fact that string -# comparisons are not compatible with numeric comparisons, this is not -# necessarily trivial to do in a autoconf script. This macro makes doing -# these comparisons easy. -# -# The six basic comparisons are available, as well as checking equality -# limited to a certain number of minor-version levels. -# -# The operator OP determines what type of comparison to do, and can be one -# of: -# -# eq - equal (test A == B) -# ne - not equal (test A != B) -# le - less than or equal (test A <= B) -# ge - greater than or equal (test A >= B) -# lt - less than (test A < B) -# gt - greater than (test A > B) -# -# Additionally, the eq and ne operator can have a number after it to limit -# the test to that number of minor versions. -# -# eq0 - equal up to the length of the shorter version -# ne0 - not equal up to the length of the shorter version -# eqN - equal up to N sub-version levels -# neN - not equal up to N sub-version levels -# -# When the condition is true, shell commands ACTION-IF-TRUE are run, -# otherwise shell commands ACTION-IF-FALSE are run. The environment -# variable 'ax_compare_version' is always set to either 'true' or 'false' -# as well. -# -# Examples: -# -# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) -# -# would both be true. -# -# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) -# -# would both be false. -# -# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) -# -# would be true because it is only comparing two minor versions. -# -# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) -# -# would be true because it is only comparing the lesser number of minor -# versions of the two values. -# -# Note: The characters that separate the version numbers do not matter. An -# empty string is the same as version 0. OP is evaluated by autoconf, not -# configure, so must be a string, not a variable. -# -# The author would like to acknowledge Guido Draheim whose advice about -# the m4_case and m4_ifvaln functions make this macro only include the -# portions necessary to perform the specific comparison specified by the -# OP argument in the final configure script. -# -# LICENSE -# -# Copyright (c) 2008 Tim Toolan -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -dnl ######################################################################### -AC_DEFUN([AX_COMPARE_VERSION], [ - AC_PROG_AWK - - # Used to indicate true or false condition - ax_compare_version=false - - # Convert the two version strings to be compared into a format that - # allows a simple string comparison. The end result is that a version - # string of the form 1.12.5-r617 will be converted to the form - # 0001001200050617. In other words, each number is zero padded to four - # digits, and non digits are removed. - AS_VAR_PUSHDEF([A],[ax_compare_version_A]) - A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - AS_VAR_PUSHDEF([B],[ax_compare_version_B]) - B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary - dnl # then the first line is used to determine if the condition is true. - dnl # The sed right after the echo is to remove any indented white space. - m4_case(m4_tolower($2), - [lt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [gt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [le],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ], - [ge],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ],[ - dnl Split the operator from the subversion count if present. - m4_bmatch(m4_substr($2,2), - [0],[ - # A count of zero means use the length of the shorter version. - # Determine the number of characters in A and B. - ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` - ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` - - # Set A to no more than B's length and B to no more than A's length. - A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` - B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` - ], - [[0-9]+],[ - # A count greater than zero means use only that many subversions - A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - ], - [.+],[ - AC_WARNING( - [illegal OP numeric parameter: $2]) - ],[]) - - # Pad zeros at end of numbers to make same length. - ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" - B="$B`echo $A | sed 's/./0/g'`" - A="$ax_compare_version_tmp_A" - - # Check for equality or inequality as necessary. - m4_case(m4_tolower(m4_substr($2,0,2)), - [eq],[ - test "x$A" = "x$B" && ax_compare_version=true - ], - [ne],[ - test "x$A" != "x$B" && ax_compare_version=true - ],[ - AC_WARNING([illegal OP parameter: $2]) - ]) - ]) - - AS_VAR_POPDEF([A])dnl - AS_VAR_POPDEF([B])dnl - - dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. - if test "$ax_compare_version" = "true" ; then - m4_ifvaln([$4],[$4],[:])dnl - m4_ifvaln([$5],[else $5])dnl - fi -]) dnl AX_COMPARE_VERSION diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 deleted file mode 100644 index f9463d37fcaa..000000000000 --- a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_common.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# XCB_UTIL_COMMON(xcb-required-version, xcb-proto-required-version) -# ----------------------------------------------------------------- -# -# Defines default options for xcb-util libraries. xorg/util/macros >= -# 1.6.0 is required for cross-platform compiler flags and to build -# library documentation. -# -AC_DEFUN([XCB_UTIL_COMMON], [ -m4_ifndef([AX_COMPARE_VERSION], - [m4_fatal([could not find AX_COMPARE_VERSION in macros search path])]) - -AC_REQUIRE([AC_PROG_LIBTOOL]) - -# Define header files and pkgconfig paths -xcbincludedir='${includedir}/xcb' -AC_SUBST(xcbincludedir) -pkgconfigdir='${libdir}/pkgconfig' -AC_SUBST(pkgconfigdir) - -# Check xcb version -PKG_CHECK_MODULES(XCB, xcb >= [$1]) - -# Check version of xcb-proto that xcb was compiled against -xcbproto_required=[$2] - -AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required]) -xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb` -AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", - xcbproto_ok="no") -AC_MSG_RESULT([$xcbproto_ok]) - -if test $xcbproto_ok = no; then - AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher]) -fi - -# Call macros from Xorg util-macros -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.6.0 or later before running autoconf/autogen])]) - -XORG_MACROS_VERSION([1.6.0]) -XORG_DEFAULT_OPTIONS -XORG_ENABLE_DEVEL_DOCS -XORG_WITH_DOXYGEN -]) # XCB_UTIL_COMMON diff --git a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 b/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 deleted file mode 100644 index a3ddce4a706f..000000000000 --- a/pkgs/development/libraries/xcb-util-cursor/m4/xcb_util_m4_with_include_path.m4 +++ /dev/null @@ -1,24 +0,0 @@ -# XCB_UTIL_M4_WITH_INCLUDE_PATH -# ------------------------------ -# -# This macro attempts to locate an m4 macro processor which supports -# -I option and is only useful for modules relying on M4 in order to -# expand macros in source code files. -# -# M4: variable holding the path to an usable m4 program. -# -# This macro requires Autoconf 2.62 or later as it is relying upon -# AC_PATH_PROGS_FEATURE_CHECK macro. NOTE: As soon as the minimum -# required version of Autoconf for Xorg is bumped to 2.62, this macro -# is supposed to be shipped with xorg/util/macros. -# -AC_DEFUN([XCB_UTIL_M4_WITH_INCLUDE_PATH], [ -AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4], - [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4], - [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \ - ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], - [AC_MSG_ERROR([could not find m4 that supports -I option])], - [$PATH:/usr/gnu/bin])]) - -AC_SUBST([M4], [$ac_cv_path_M4]) -]) # XCB_UTIL_M4_WITH_INCLUDE_PATH diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c9074c59caf8..0b972102e7c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1770,6 +1770,7 @@ mapAliases { wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 + xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12 xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f94bfe8a0a49..2fafbf0a3763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8407,7 +8407,6 @@ with pkgs; }; xcb-util-cursor = xorg.xcbutilcursor; - xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; xgboostWithCuda = xgboost.override { cudaSupport = true; }; @@ -10859,9 +10858,7 @@ with pkgs; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); - i3 = callPackage ../applications/window-managers/i3 { - xcb-util-cursor = if stdenv.hostPlatform.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; - }; + i3 = callPackage ../applications/window-managers/i3 { }; i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { };