diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9a3a0ead9e09..3c60e66f9aa1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9556,6 +9556,12 @@
     githubId = 127353;
     name = "Geoffrey Huntley";
   };
+  gibbert = {
+    email = "gbjgms@gmail.com";
+    github = "zgibberish";
+    githubId = 67570424;
+    name = "gibbert";
+  };
   gigahawk = {
     email = "Jasper Chan";
     name = "jasperchan515@gmail.com";
diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix
index 18a8cdf57618..40ef6fa5ae23 100644
--- a/pkgs/applications/audio/mmlgui/default.nix
+++ b/pkgs/applications/audio/mmlgui/default.nix
@@ -6,9 +6,9 @@
   pkg-config,
   glfw,
   libvgm,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   cppunit,
 }:
 
@@ -55,9 +55,9 @@ stdenv.mkDerivation {
     libvgm
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
   ];
 
   checkInputs = [
diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix
index a6b601601264..3a632d0fb340 100644
--- a/pkgs/applications/audio/open-music-kontrollers/generic.nix
+++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix
@@ -7,8 +7,8 @@
   ninja,
   lv2,
   sord,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   glew,
   lv2lint,
   pname,
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
   buildInputs = [
     lv2
     sord
-    libX11
-    libXext
+    libx11
+    libxext
     glew
     lv2lint
   ]
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index 7bbc20ac0c4c..bcab38ff170d 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -6,8 +6,8 @@
   alsa-utils,
   fltk,
   libjack2,
-  libXft,
-  libXpm,
+  libxft,
+  libxpm,
   libjpeg,
   libpng,
   libsamplerate,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     alsa-utils
     fltk
     libjack2
-    libXft
-    libXpm
+    libxft
+    libxpm
     libjpeg
     libpng
     libsamplerate
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index ea7cbdfe621c..1a76c7b2acbc 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -36,8 +36,8 @@
   fltk,
   libGL,
   libjpeg,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   ntk,
 
   # Test dependencies
@@ -116,16 +116,16 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (guiModule == "fltk") [
     fltk
     libjpeg
-    libXpm
+    libxpm
   ]
   ++ lib.optionals (guiModule == "ntk") [
     ntk
     cairo
-    libXpm
+    libxpm
   ]
   ++ lib.optionals (guiModule == "zest") [
     libGL
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
index 63d4e4ffd7d8..7160a2cd1631 100644
--- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
@@ -8,7 +8,7 @@
   ruby,
   libGL,
   libuv,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGL
     libuv
-    libX11
+    libx11
   ];
 
   # Force optimization to fix:
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index 09fa4c71998d..64296db0c33d 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -7,7 +7,7 @@
   pkg-config,
   qttools,
   libxcb,
-  libXau,
+  libxau,
   pam,
   qtbase,
   qtdeclarative,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXau
+    libxau
     pam
     qtbase
     qtdeclarative
diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix
index 4e2fce6eb9c2..308e112a8c77 100644
--- a/pkgs/applications/editors/android-studio-for-platform/common.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/common.nix
@@ -25,12 +25,12 @@
   fontsConf,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   makeFontsConf,
   makeWrapper,
   ncurses5,
@@ -107,14 +107,14 @@ let
             # Crash at startup without these
             fontconfig
             freetype
-            libXext
-            libXi
-            libXrender
-            libXtst
-            libX11
+            libxext
+            libxi
+            libxrender
+            libxtst
+            libx11
 
             # Support multiple monitors
-            libXrandr
+            libxrandr
 
             # For GTKLookAndFeel
             gtk2
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index b3dbb8e516b4..3724d382ee0c 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -34,7 +34,7 @@
   libpng,
   libuuid,
   libsecret,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   mesa-demos,
@@ -44,15 +44,15 @@
   libxcb-image,
   libxcb-cursor,
   libxkbfile,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   makeWrapper,
   ncurses5,
   nspr,
@@ -141,10 +141,10 @@ let
             # Crash at startup without these
             fontconfig
             freetype
-            libXext
-            libXi
-            libXrender
-            libXtst
+            libxext
+            libxi
+            libxrender
+            libxtst
             libsecret
 
             # No crash, but attempted to load at startup
@@ -159,7 +159,7 @@ let
             zlib
             pkgsi686Linux.zlib
             # Support multiple monitors
-            libXrandr
+            libxrandr
 
             # For Android emulator
             alsa-lib
@@ -168,7 +168,7 @@ let
             libbsd
             libpulseaudio
             libuuid
-            libX11
+            libx11
             libxcb
             libxkbcommon
             libxcb-wm
@@ -179,10 +179,10 @@ let
             libice
             libsm
             libxkbfile
-            libXcomposite
-            libXcursor
-            libXdamage
-            libXfixes
+            libxcomposite
+            libxcursor
+            libxdamage
+            libxfixes
             libGL
             libdrm
             libpng
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 15188aa9f1ac..2c690523e9f4 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -5,7 +5,7 @@
   coreutils,
   lazarus,
   fpc,
-  libX11,
+  libx11,
 
   # GTK2/3
   pango,
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
-    libX11
+    libx11
   ]
   ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
     pango
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 74b728362170..b43949c12542 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -4,14 +4,14 @@
   makeDesktopItem,
   freetype,
   fontconfig,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   zlib,
   jdk,
   glib,
   glib-networking,
   gtk,
-  libXtst,
+  libxtst,
   libsecret,
   gsettings-desktop-schemas,
   webkitgtk_4_1,
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk
     jdk
-    libX11
-    libXrender
-    libXtst
+    libx11
+    libxrender
+    libxtst
     libsecret
     zlib
   ]
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
       lib.makeLibraryPath [
         freetype
         fontconfig
-        libX11
-        libXrender
+        libx11
+        libxrender
         zlib
       ]
     } $libCairo
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
           [
             glib
             gtk
-            libXtst
+            libxtst
             libsecret
           ]
           ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 5eb5d8029bef..a707927a54b4 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -6,12 +6,12 @@
   makeWrapper,
   freetype,
   fontconfig,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   zlib,
   glib,
   gtk3,
-  libXtst,
+  libxtst,
   jdk,
   gsettings-desktop-schemas,
   webkitgtk_4_1 ? null, # for internal web browser
@@ -56,13 +56,13 @@ let
       makeDesktopItem
       freetype
       fontconfig
-      libX11
-      libXrender
+      libx11
+      libxrender
       zlib
       jdk
       glib
       gtk
-      libXtst
+      libxtst
       gsettings-desktop-schemas
       webkitgtk_4_1
       makeWrapper
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index f9e5c7367dcd..431a30956430 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -30,12 +30,12 @@
   harfbuzz,
   imagemagick,
   jansson,
-  libXaw,
-  libXcursor,
-  libXft,
-  libXi,
-  libXpm,
-  libXrandr,
+  libxaw,
+  libxcursor,
+  libxft,
+  libxi,
+  libxpm,
+  libxrandr,
   libgccjit,
   libjpeg,
   libotf,
@@ -314,7 +314,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withPgtk [
     giflib
     gtk3
-    libXpm
+    libxpm
     libjpeg
     libpng
     librsvg
@@ -335,9 +335,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withX [
     Xaw3d
     giflib
-    libXaw
-    libXpm
-    libXrandr
+    libxaw
+    libxpm
+    libxrandr
     libjpeg
     libpng
     librsvg
@@ -347,10 +347,10 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
   ]
   ++ lib.optionals (withX && !withCairo) [
-    libXft
+    libxft
   ]
   ++ lib.optionals withXinput2 [
-    libXi
+    libxi
   ]
   ++ lib.optionals withWebkitgtk [
     webkitgtk_4_1
@@ -485,7 +485,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") ''
-    patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs
+    patchelf --add-rpath ${lib.makeLibraryPath [ libxcursor ]} $out/bin/emacs
     patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
   '';
 
diff --git a/pkgs/applications/editors/jetbrains/builder/linux.nix b/pkgs/applications/editors/jetbrains/builder/linux.nix
index 5194df00de23..5e4d2377ca89 100644
--- a/pkgs/applications/editors/jetbrains/builder/linux.nix
+++ b/pkgs/applications/editors/jetbrains/builder/linux.nix
@@ -21,7 +21,7 @@
   glibcLocales,
   fontconfig,
   libGL,
-  libX11,
+  libx11,
 
   jdk,
   vmopts ? null,
@@ -85,7 +85,7 @@ lib.extendMkDerivation {
         stdenv.cc.cc
         fontconfig
         libGL
-        libX11
+        libx11
       ];
 
       nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index c7db457d1740..dad1f9b73c8f 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -12,7 +12,7 @@
   musl,
   libice,
   libsm,
-  libX11,
+  libx11,
   dotnetCorePackages,
   libxcb-keysyms,
   expat,
@@ -75,7 +75,7 @@ in
     # Avalonia dependencies needed for dotMemory
     libice
     libsm
-    libX11
+    libx11
   ];
 
   # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 7ea0de1676ae..e2d251d93b99 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -16,14 +16,14 @@
   perl,
   tcl,
   ruby,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libsm,
-  libXpm,
-  libXt,
-  libXaw,
-  libXau,
-  libXmu,
+  libxpm,
+  libxt,
+  libxaw,
+  libxau,
+  libxmu,
   libsodium,
   libice,
   wayland-scanner,
@@ -179,13 +179,13 @@ stdenv.mkDerivation {
   ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
     libsm
     libice
-    libX11
-    libXext
-    libXpm
-    libXt
-    libXaw
-    libXau
-    libXmu
+    libx11
+    libxext
+    libxpm
+    libxt
+    libxaw
+    libxau
+    libxmu
   ]
   ++ lib.optional (guiSupport == "gtk2") gtk2-x11
   ++ lib.optional (guiSupport == "gtk3") gtk3-x11
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d679909fe41b..0ebd96e5cff6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -15188,6 +15188,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  telescope-ast-grep-nvim = buildVimPlugin {
+    pname = "telescope-ast-grep.nvim";
+    version = "0-unstable-2023-11-05";
+    src = fetchFromGitHub {
+      owner = "ray-x";
+      repo = "telescope-ast-grep.nvim";
+      rev = "fa7d7fa5c723b57bba333429224e99fde2a63632";
+      hash = "sha256-WPzFG8gdf0XzxsFkxgseOy6GQBu9C2KDOXeasdct0F8=";
+    };
+    meta.homepage = "https://github.com/ray-x/telescope-ast-grep.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   telescope-asynctasks-nvim = buildVimPlugin {
     pname = "telescope-asynctasks.nvim";
     version = "0-unstable-2022-04-09";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2508344be1c9..b09cba248435 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1166,6 +1166,7 @@ https://github.com/wellle/targets.vim/,,
 https://github.com/tbabej/taskwiki/,,
 https://github.com/tomtom/tcomment_vim/,,
 https://github.com/nvim-telekasten/telekasten.nvim/,,
+https://github.com/ray-x/telescope-ast-grep.nvim/,HEAD,
 https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
 https://github.com/nvim-telescope/telescope-cheat.nvim/,,
 https://github.com/fannheyward/telescope-coc.nvim/,,
diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix
index fd5ed5924b27..fda1ee74cebd 100644
--- a/pkgs/applications/emulators/kega-fusion/default.nix
+++ b/pkgs/applications/emulators/kega-fusion/default.nix
@@ -10,10 +10,10 @@
   gtk2,
   alsa-lib,
   libsm,
-  libX11,
+  libx11,
   gdk-pixbuf,
   pango,
-  libXinerama,
+  libxinerama,
   mpg123,
   runtimeShell,
 }:
@@ -27,10 +27,10 @@ let
     gtk2
     alsa-lib
     libsm
-    libX11
+    libx11
     gdk-pixbuf
     pango
-    libXinerama
+    libxinerama
   ];
 
 in
diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix
index b2723c025be9..8b076fa54829 100644
--- a/pkgs/applications/emulators/libretro/cores/citra.nix
+++ b/pkgs/applications/emulators/libretro/cores/citra.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   mkLibretroCore,
 }:
 mkLibretroCore {
@@ -29,7 +29,7 @@ mkLibretroCore {
   extraBuildInputs = [
     libGL
     libGLU
-    libX11
+    libx11
   ];
 
   extraNativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index aad123a10c56..9db7a75cc8f6 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -12,8 +12,8 @@
   fontconfig,
   glm,
   installShellFiles,
-  libXi,
-  libXinerama,
+  libxi,
+  libxinerama,
   libjpeg,
   libpcap,
   libpulseaudio,
@@ -93,8 +93,8 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libpulseaudio
-    libXinerama
-    libXi
+    libxinerama
+    libxi
     fontconfig
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix
index ead5cd4289f4..5a313443fee7 100644
--- a/pkgs/applications/emulators/zsnes/2.x.nix
+++ b/pkgs/applications/emulators/zsnes/2.x.nix
@@ -6,7 +6,7 @@
   libGL,
   libGLU,
   libpng,
-  libX11,
+  libx11,
   nasm,
   pkg-config,
   zlib,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libpng
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index bfc91646471d..a019120e2fc6 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libxinerama,
   imlib2,
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     imlib2
     libxinerama
   ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
     gcc -g imlibsetroot.c -o imlibsetroot              \
       -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \
-      -I${libX11.dev}/include -lXinerama -lX11
+      -I${libx11.dev}/include -lXinerama -lX11
 
     runHook postBuild
   '';
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index a54fc5d1685c..9d3738d17752 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -32,7 +32,7 @@
   libsigcxx,
   libvisio,
   libwpg,
-  libXft,
+  libxft,
   libxml2,
   libxslt,
   readline,
@@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsigcxx
     libvisio
     libwpg
-    libXft
+    libxft
     libxml2
     libxslt
     readline
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 644aa457acba..2c6d63d0e918 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -12,14 +12,14 @@
   libdatrie,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
   makeWrapper,
   pixman,
   libpthread-stubs,
   gtkmm3,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lcms2,
   libiptcdata,
   fftw,
@@ -81,12 +81,12 @@ stdenv.mkDerivation rec {
     libdatrie
     libxkbcommon
     libepoxy
-    libXtst
+    libxtst
     pixman
     libpthread-stubs
     gtkmm3
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     lcms2
     libiptcdata
     fftw
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index 21c34ad95c6c..509f21e65a47 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   autoconf,
   sane-backends,
-  libX11,
+  libx11,
   gtk2,
   pkg-config,
   libusb-compat-0_1 ? null,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     sane-backends
-    libX11
+    libx11
     gtk2
   ]
   ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 4fcd2792617e..a4d12da344e4 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libXft,
+  libxft,
   imlib2,
   giflib,
   libexif,
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   preBuild = lib.optionalString (conf != null) "cp ${configFile} config.def.h";
 
   buildInputs = [
-    libXft
+    libxft
     imlib2
     giflib
     libexif
diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix
index dbbccc45c736..503cbdd28cfa 100644
--- a/pkgs/applications/graphics/unigine-sanctuary/default.nix
+++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix
@@ -4,10 +4,10 @@
   fetchurl,
   makeWrapper,
   autoPatchelfHook,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
   libglvnd,
   openal,
   glibc,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     stdenv.cc.cc
-    libX11
-    libXext
-    libXrandr
-    libXinerama
+    libx11
+    libxext
+    libxrandr
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 78ddf8f4edae..8d3033f017e8 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -7,17 +7,17 @@
   fontconfig,
   zlib,
   qtquickcontrols2,
-  libXinerama,
+  libxinerama,
   libxcb,
   libsm,
-  libXi,
+  libxi,
   libglvnd,
-  libXext,
-  libXrandr,
+  libxext,
+  libxrandr,
   mailspring,
-  libX11,
+  libx11,
   libice,
-  libXrender,
+  libxrender,
   autoPatchelfHook,
   makeWrapper,
   xkeyboard_config,
@@ -52,17 +52,17 @@ let
       fontconfig
       zlib
       qtquickcontrols2
-      libXinerama
+      libxinerama
       libxcb
       libsm
-      libXi
+      libxi
       libglvnd
-      libXext
-      libXrandr
+      libxext
+      libxrandr
       mailspring
-      libX11
+      libx11
       libice
-      libXrender
+      libxrender
     ];
 
     installPhase = ''
@@ -109,17 +109,17 @@ buildFHSEnv {
     fontconfig
     zlib
     qtquickcontrols2
-    libXinerama
+    libxinerama
     libxcb
     libsm
-    libXi
+    libxi
     libglvnd
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     mailspring
-    libX11
+    libx11
     libice
-    libXrender
+    libxrender
     openal
   ];
   runScript = "superposition";
diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix
index bbcf0648369c..67cea522ae00 100644
--- a/pkgs/applications/graphics/unigine-tropics/default.nix
+++ b/pkgs/applications/graphics/unigine-tropics/default.nix
@@ -4,10 +4,10 @@
   fetchurl,
   makeWrapper,
   autoPatchelfHook,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
   libglvnd,
   openal,
   glibc,
@@ -78,10 +78,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     stdenv.cc.cc
-    libX11
-    libXext
-    libXrandr
-    libXinerama
+    libx11
+    libxext
+    libxrandr
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index be52ef6a3a82..41b393f3ee84 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   buildDotnetModule,
   dotnetCorePackages,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
   fontconfig,
   glew,
   makeDesktopItem,
@@ -59,13 +59,13 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     # Avalonia UI
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
     fontconfig
     glew
   ];
diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix
index 4539c3606639..3083af21c1da 100644
--- a/pkgs/applications/misc/goldendict-ng/default.nix
+++ b/pkgs/applications/misc/goldendict-ng/default.nix
@@ -16,7 +16,7 @@
   fmt,
   bzip2,
   libiconv,
-  libXtst,
+  libxtst,
   qtbase,
   qtsvg,
   qtwebengine,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     hunspell
     xz
     lzo
-    libXtst
+    libxtst
     bzip2
     libiconv
     opencc
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 672a300a6c2c..06cff3872060 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libXtst,
+  libxtst,
   libvorbis,
   hunspell,
   lzo,
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     qtx11extras
-    libXtst
+    libxtst
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     bzip2
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index 0b476660c585..76722bdeb2e8 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -8,10 +8,10 @@
   libGLU,
   libsm,
 
-  libXcomposite,
-  libXi,
-  libXrender,
-  libX11,
+  libxcomposite,
+  libxi,
+  libxrender,
+  libx11,
 
   libxcb,
   sqlite,
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     libsm
-    libX11
-    libXcomposite
-    libXi
-    libXrender
+    libx11
+    libxcomposite
+    libxi
+    libxrender
     libproxy
     libxcb
     libxml2_13
diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 30e521755fde..7841debc7c9b 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -16,7 +16,7 @@
   zenity,
   luajit_2_1,
   libGL,
-  libX11,
+  libx11,
 
   builderArgs,
 }:
@@ -58,7 +58,7 @@ buildDubPackage (
       freetype
       SDL2
       libGL
-      libX11
+      libx11
     ];
 
     dontUseCmakeConfigure = true;
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 7ca6353aa9fc..7f3374ac0860 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # buildInputs
-  libXScrnSaver,
+  libxscrnsaver,
   magic-enum,
 
   # nativeBuildInputs
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libXScrnSaver
+    libxscrnsaver
     magic-enum
     qtbase
     qtconnectivity
diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index f259b7771750..c483c5bb6488 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -10,11 +10,11 @@
   openssl,
   udev,
   libglvnd,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXfixes,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxfixes,
   libpulseaudio,
   libva,
   ffmpeg_7,
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
   buildInputs = [
     stdenv.cc.cc # libstdc++
     libglvnd
-    libX11
+    libx11
   ];
 
   runtimeDependenciesPath = lib.makeLibraryPath [
@@ -58,11 +58,11 @@ stdenvNoCC.mkDerivation {
     libpng
     libjpeg8
     curl
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXfixes
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxfixes
     vulkan-loader
   ];
 
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix
index e443741ebd25..d7078b2be9c9 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/applications/misc/qMasterPassword/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   cmake,
   qtbase,
   qttools,
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
     libscrypt
   ]
   ++ lib.optionals x11Support [
-    libX11
-    libXtst
+    libx11
+    libxtst
   ];
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 5920f8e351bd..ef12052d6c91 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -24,7 +24,7 @@
   withDrm ? stdenv.hostPlatform.isLinux,
   libdrm,
   withVidmode ? stdenv.hostPlatform.isLinux,
-  libXxf86vm,
+  libxxf86vm,
 
   withGeolocation ? true,
   withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin,
@@ -88,7 +88,7 @@ let
       ++ lib.optional withRandr libxcb
       ++ lib.optional withGeoclue geoclue
       ++ lib.optional withDrm libdrm
-      ++ lib.optional withVidmode libXxf86vm
+      ++ lib.optional withVidmode libxxf86vm
       ++ lib.optional withAppIndicator (
         if (pname != "gammastep") then libappindicator else libayatana-appindicator
       );
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index bf49a24c4c04..5dcec2b91675 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -6,10 +6,10 @@
   wrapQtAppsHook,
   patchelf,
   qt5,
-  libXtst,
-  libXext,
-  libX11,
-  libXScrnSaver,
+  libxtst,
+  libxext,
+  libx11,
+  libxscrnsaver,
   writeScript,
   common-updater-scripts,
   curl,
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
       --set-rpath "${
         lib.makeLibraryPath [
           qt5.qtbase
-          libXtst
-          libXext
-          libX11
-          libXScrnSaver
+          libxtst
+          libxext
+          libx11
+          libxscrnsaver
         ]
       }" \
       $out/bin/rescuetime
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a2014e91f357..7922e5fd0eb6 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -24,7 +24,7 @@
   qtsvg,
   qttools,
   qtpositioning,
-  libXcomposite,
+  libxcomposite,
   bluez,
   writeScript,
 }:
@@ -89,7 +89,7 @@ let
     buildInputs = [
       qtbase
       qtlocation
-      libXcomposite
+      libxcomposite
     ];
 
     dontWrapQtApps = true;
diff --git a/pkgs/applications/misc/sweethome3d/linux.nix b/pkgs/applications/misc/sweethome3d/linux.nix
index 46f24c071cf9..c76a9d54ca18 100644
--- a/pkgs/applications/misc/sweethome3d/linux.nix
+++ b/pkgs/applications/misc/sweethome3d/linux.nix
@@ -11,7 +11,7 @@
   gsettings-desktop-schemas,
   p7zip,
   autoPatchelfHook,
-  libXxf86vm,
+  libxxf86vm,
   libGL,
   copyDesktopItems,
 
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
     p7zip
     gtk3
     gsettings-desktop-schemas
-    libXxf86vm
+    libxxf86vm
   ];
 
   # upstream targets Java 7 by default
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 74e5606dfbeb..79e4a1fe3253 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -59,9 +59,9 @@
   glib,
   gtk3,
   dbus-glib,
-  libXScrnSaver,
-  libXcursor,
-  libXtst,
+  libxscrnsaver,
+  libxcursor,
+  libxtst,
   libxshmfence,
   libGLU,
   libGL,
@@ -70,7 +70,7 @@
   pciutils,
   protobuf,
   speechd-minimal,
-  libXdamage,
+  libxdamage,
   at-spi2-core,
   pipewire,
   libva,
@@ -365,9 +365,9 @@ let
       glib
       gtk3
       dbus-glib
-      libXScrnSaver
-      libXcursor
-      libXtst
+      libxscrnsaver
+      libxcursor
+      libxtst
       libxshmfence
       libGLU
       libGL
@@ -375,7 +375,7 @@ let
       pciutils
       protobuf
       speechd-minimal
-      libXdamage
+      libxdamage
       at-spi2-core
       pipewire
       libva
@@ -425,9 +425,9 @@ let
       glib
       gtk3
       dbus-glib
-      libXScrnSaver
-      libXcursor
-      libXtst
+      libxscrnsaver
+      libxcursor
+      libxtst
       libxshmfence
       libGLU
       libGL
@@ -436,7 +436,7 @@ let
       pciutils
       protobuf
       speechd-minimal
-      libXdamage
+      libxdamage
       at-spi2-core
       pipewire
       libva
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7780edc2f9d9..2186453baef9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -9,7 +9,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
   runtimeDependencies = [
     curl
diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index a317577efc0e..c81fea5eb958 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -13,7 +13,7 @@
   withGTK3 ? true,
   gtk3,
   libglvnd,
-  libXt,
+  libxt,
   libpulseaudio,
   makeDesktopItem,
   wrapGAppsHook3,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     dbus-glib
     gtk2-x11
-    libXt
+    libxt
     (lib.getLib stdenv.cc.cc)
   ]
   ++ lib.optionals withGTK3 [
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index 35f6baea1aab..2140d0b31c72 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "6dfe83a7d8984a5fe6be63a429698ce3fc61761ce68e3f4f2c6f3ff96a349f37"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "572f512cc0bdf89213d2c532e6182d4a291663bb38a51beb57197bf3fb67dd47"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "a65a1ed1cf081285d4c32ed3989d95cb0a4d90209e99a8765b65d41b02ea059d"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "cbda428d59a8593267343fb32ad985bf2125f45860425f9b7b31bbea9d305046"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "ffaee35854e9bfa6f34fae0a7a2ff81e8909cfb2d5a5bd65df89c03a1ceb1b3a"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "b92568a2fa8683a5abd29c151d12f2737bf7ac961dfa615a2fa891a66f2d23cf"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "0f6e598bf90b9ced4f1f758db6b0d7f8afbf9b5973d801d8a743c5b27ac3b748"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "cc99b0211110b8dc14c47cde0fe9b93b7e36c2ead64286412a896f6aa8a722cf"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "297beda34a0a2a7ff727fced94dba6f999636a4e9b2cdd6e30840cc0e746a4ee"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "a7ab99f7e2a6cf6ecc833c8ba67ba154b3ff186c58d574fa4bbda2e70dcb55f7"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
index 905c26918e97..d37386e72219 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.32.11+k3s1";
-  k3sCommit = "8119508834f2503e3c7bace3125f5db6b038d377";
-  k3sRepoSha256 = "0fni4sh3a5flyrli7xxd9zxj9sh75kv79msy3zkfbgjxqz7rg4v9";
-  k3sVendorHash = "sha256-8gzvad5Cpkatc8158m9FBGnkGEbajn30alSPlzhor0E=";
+  k3sVersion = "1.32.11+k3s3";
+  k3sCommit = "c9aa1d2889a003715698542826c2af94160ac2e5";
+  k3sRepoSha256 = "0fi634dnsghjwnp07h6jhknccqlr9n5g3l34sipc41vvfmn4b0k8";
+  k3sVendorHash = "sha256-qbmqzsd8oMQSFCh7HvjDiYds5gLEIGjjcv4EJbgxfJI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1.32";
   containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.31.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s2.32";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index d1cce735c16a..8b50bf120d6f 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "47644f3141878535a1951fdaf03bc485001b50a58b8fb58d97c75c49ea38a1f0"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "130a3b3e51947b7a0beffca422b85c2d3fbe78b1163a0fc069871877021123d3"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "b0d7062008fa7fcad9ad7c6b60f74ae1c561927dbb5a4105433f5afbd091361b"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "ee76f65f39a0ca12bbaa6bf9fdd5dc161b553b15a5746d47795cf0113916c063"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "6451f4bd29b4ab76dcbfa520d907425976a04e9d5044b969e81fa2dfdc085c20"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "03a165ad40d022616281fbf329bcfa546b9245a9f431d1c362b86faff72d83dd"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "a2f534291abd4d6491dc669b46e437df1fe0cd7b573485ec30aa813510b22635"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "6243a503de28c17f4b1b16018237a5008bc99983dc3b3b87ed2a1fe790d9e211"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "87db88828e43179ef30a17ba66b416a3e398c4a00673908bd8d39ae4996ce300"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "74713adf726f6b407330b93e252b7a8e0a85204137c8a6f61b66f681b5761c42"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index de73eecf3c19..49a514d8fd05 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.33.7+k3s1";
-  k3sCommit = "0b396d3f7f26e0c2ae5b6a114383830f533938c2";
-  k3sRepoSha256 = "0jkvm7c333zazabsxrjl6wkdsni1m5g5gamriyyf53lly9935wsf";
-  k3sVendorHash = "sha256-HpgcO/mUo64mkH38sAURnLOmXdXmHh3o6iDKtQeUt/E=";
+  k3sVersion = "1.33.7+k3s3";
+  k3sCommit = "1288e778af2a8ae295c47c213a3d13abd2969cde";
+  k3sRepoSha256 = "07274x0d0q7cn6x5g8d0zbyf67axrmchhngsjsp3plskyr313hcy";
+  k3sVendorHash = "sha256-XlZFYEGqoDGFlLJYRJDDoRPWuptFYkZT6axergChFN4=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1.33";
   containerdSha256 = "15iw6px3710rlsx7j933i07qd4a2r7caagfjbhhfcp33m9k19v7h";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.33.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s2";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
index ca2e2fb2860e..86024f6eca19 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "499d7fb0b2eab200e9bf9b3935ce787a7fa0597933dce25ad091703933d6ecc8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "696c2e10f511295f5e0e6281a2f22eec60b33962d45bc9117703db1ac887e981"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "b8dff3265568e1be66ab72ac0ded68bd266fa37a32c010f1253dba6547a49ce8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "170db25228c873741f895fced05f0e5bdbbddb8ffeb5e0342a5b8e44f3c28757"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "a4bc850fcf9b73bf0f45d4a1f50bd612e52d77daa5de5020589e7f99e5d1a3e6"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "a1b0ac3a00f409fa51e196ea9db5f2282efff00a282ab797bf49b29453bb1379"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "e67cddf839571cd489aef44acb2aca82285a9789a170c1a44d51b7f8b6129883"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "ceea4427499fb39be0bff18f840cf80a091f63e88421bc89fdfceb8017aab59b"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "e0cec00a1c19c8c6f7fde7005e325d285f23ff43752cce9ce0796ccb10e9582a"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
index 3cc9396b70cd..880c8208b997 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.34.3+k3s1";
-  k3sCommit = "48ffa7b6893f21b919b3029d54c9d9838ae426a1";
-  k3sRepoSha256 = "1177kzbhp6ihb7dzfdi1a0idgp69y1hwh6wnwvdx1fnivg2gj7aw";
-  k3sVendorHash = "sha256-dp8SU24nuy3WmG1Zln/J2nVHnVQmVyN78FBOSxNjbF8=";
+  k3sVersion = "1.34.3+k3s3";
+  k3sCommit = "2975fb0973ca47f54b1aa2a8c3a976a779f52349";
+  k3sRepoSha256 = "0bvccp573xihzbnkd3n6xldcxpnlwiz9b5p0fw6sxv69m7jaac2f";
+  k3sVendorHash = "sha256-R8QXwXmTKsONsbWaedFNDPdYZ82jaQ/T8S9sllqKPjk=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1";
   containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.34.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
index aa290e65619b..5da05dfcef7f 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "af7ce67f0a8c457618a492ba995cc645d8ad13512008b88db97719941c39389a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "8a1c1f25d62d3395fbb2b37d55cf3d836ca4bc68e6358d21b6573f42d295c6f0"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "2e3d6d14bbbeb8c16f1849cca8da48887c5a7ddceb1cc2bf60be63e4fa8c63f3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "82cf1310db1bfac5733c5c16864034c6c7c7affc60c39be610ce7cf169631ef5"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "8659dda950ab0ddff37b2c8d59f527489e1accde30f652b6c3b434385825b8b5"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "fab2006d48153f278332504c1aa8b03e5683c14924f66ecbd5eeb7db3a5dedd9"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "cb3d24f44c9f29da3421e99db0801f2a30b3e16c7032c423a9b631c0fc66a5fa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "ec9a3d8b04445afe24093dd0f4e65a1da6b3a5d73f3c739746aaa8ec0aaa03cb"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "4c6a31ffa5bc267986f47f36396c51232f55b5db22253630bf7e8b48ea41084f"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
index 54a6fbdde470..420e5f4422c0 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.35.0+k3s1";
-  k3sCommit = "a6c6cd15c0c42ec9fce21f8ad5f42aa74fddb4f2";
-  k3sRepoSha256 = "0033m0vbysy2bcjfmam387580j1cmq6cys8diismgf8m5s64nivb";
-  k3sVendorHash = "sha256-S9GkT87C8qbuefH93Y6d0Y95NNuT6paNdDkmSDllFIY=";
+  k3sVersion = "1.35.0+k3s3";
+  k3sCommit = "323b95245012f0d56a863d8c23964399814191c2";
+  k3sRepoSha256 = "1h6az9xj074pj8s60p2yw9gbqz2dabrxvrq41igcw0nq7ymcwaaz";
+  k3sVendorHash = "sha256-4Qs03mrOJBxsyQe4RrDG9vvS23JwjUPhPec/TebS4Yw=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1";
   containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.35.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c9ade2fd4bdd..ce7935fd16be 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-6sVapd0vqL4xGLqTQS4zQIlnMA8HRmjufDi1lOgldlU="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-JcNbhR9qeakHWTDu4tF3Sl2G5zfcohNEsK87znI5hiM=",
+    "hash": "sha256-NL2UmL4wLBbdT5DW7uGYOBQwPN0nQUP54gtFwc2PcB8=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.269.0",
+    "rev": "v1.270.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
+    "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
   },
   "aminueza_minio": {
     "hash": "sha256-rgrX08mO99cl95YTW0rqFH/jJhyxMr/DSIEL5Wg9R9s=",
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 272e68447aed..c867158d90e1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -32,17 +32,17 @@
   libpulseaudio,
   libuuid,
   libva,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   libgbm,
@@ -116,10 +116,10 @@ stdenv.mkDerivation (finalAttrs: {
     cups
     libdrm
     libuuid
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -153,24 +153,24 @@ stdenv.mkDerivation (finalAttrs: {
       gtk3
       libglvnd
       libnotify
-      libX11
-      libXcomposite
+      libx11
+      libxcomposite
       libunity
       libuuid
       libva
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXrandr
-      libXrender
-      libXtst
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxrandr
+      libxrender
+      libxtst
       nspr
       libxcb
       pango
       pipewire
-      libXScrnSaver
+      libxscrnsaver
       libappindicator-gtk3
       libdbusmenu
       wayland
diff --git a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
index dbc987f8b9b1..4f8affb14418 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
@@ -5,8 +5,8 @@
   glew,
   gsm,
   lib,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libopus,
   libpulseaudio,
   libsForQt5,
@@ -47,8 +47,8 @@ mkLinphoneDerivation (finalAttrs: {
 
     ffmpeg_4
     glew
-    libX11
-    libXext
+    libx11
+    libxext
     libpulseaudio
     libv4l
     speex
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 9d4903adc988..cff21dd33d16 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -18,8 +18,8 @@
   lib,
   libice,
   libsm,
-  libXScrnSaver,
-  libXext,
+  libxscrnsaver,
+  libxext,
   libgcrypt,
   libgnt,
   libidn,
@@ -76,8 +76,8 @@ let
         gst_all_1.gstreamer
         libice
         libsm
-        libXScrnSaver
-        libXext
+        libxscrnsaver
+        libxext
         libgnt
         libidn
         libstartup_notification
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index b8dc68206883..03be31854dbc 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -20,8 +20,8 @@
   readline,
   sqlite,
   autoAwaySupport ? true,
-  libXScrnSaver,
-  libX11,
+  libxscrnsaver,
+  libx11,
   notifySupport ? true,
   libnotify,
   gdk-pixbuf,
@@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
   ]
   ++ lib.optionals autoAwaySupport [
-    libXScrnSaver
-    libX11
+    libxscrnsaver
+    libx11
   ]
   ++ lib.optionals notifySupport [
     libnotify
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 184c69feb4e0..8c36016dbd47 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -11,7 +11,7 @@
   qttools,
   libidn,
   qca-qt5,
-  libXScrnSaver,
+  libxscrnsaver,
   hunspell,
   libsecret,
   libgcrypt,
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     qtx11extras
     libidn
     qca-qt5
-    libXScrnSaver
+    libxscrnsaver
     hunspell
     libsecret
     libgcrypt
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 44aa11883449..3b6d1ddab889 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -11,7 +11,7 @@
   qtwebengine,
   libidn,
   qca-qt5,
-  libXScrnSaver,
+  libxscrnsaver,
   hunspell,
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     qtwebengine
     libidn
     qca-qt5
-    libXScrnSaver
+    libxscrnsaver
     hunspell
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 606260896580..187b1a8c1219 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -13,14 +13,14 @@
   openh264,
   crc32c,
   libvpx,
-  libX11,
-  libXtst,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXrender,
-  libXrandr,
-  libXi,
+  libx11,
+  libxtst,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxrender,
+  libxrandr,
+  libxi,
   glib,
   abseil-cpp,
   pipewire,
@@ -80,14 +80,14 @@ stdenv.mkDerivation {
     abseil-cpp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXtst
-    libXcomposite
-    libXdamage
-    libXext
-    libXrender
-    libXrandr
-    libXi
+    libx11
+    libxtst
+    libxcomposite
+    libxdamage
+    libxext
+    libxrender
+    libxrandr
+    libxi
     glib
     pipewire
     libgbm
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index b4b9f4873d83..402a40df3100 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -11,8 +11,8 @@
   cmake,
   openssl,
   xorgproto,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
   xz,
   zlib,
 }:
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
     qtwebkit
     openssl
     xorgproto
-    libX11
-    libXScrnSaver
+    libx11
+    libxscrnsaver
     xz
     zlib
   ];
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index bcc69afddec1..caa41241c0f0 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -7,7 +7,7 @@
   pkg-config,
   wrapQtAppsHook,
   bzip2,
-  libX11,
+  libx11,
   qtbase,
   qttools,
   qtmultimedia,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     qtmultimedia
     qtscript
     bzip2
-    libX11
+    libx11
     pcre-cpp
     libidn
     lua5
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 42ba28a0e96f..272a1a78a381 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -15,7 +15,7 @@
   libxslt,
   sqlcipher,
   rapidjson,
-  libXScrnSaver,
+  libxscrnsaver,
   qtbase,
   qtx11extras,
   qtmultimedia,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     qtbase
     libgnome-keyring
     bzip2
-    libXScrnSaver
+    libxscrnsaver
     libxml2
     libxslt
     sqlcipher
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 446ba3f40a64..a0ee9f9c0344 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -8,13 +8,13 @@
   dbus,
   getconf,
   glibc,
-  libXrandr,
-  libX11,
-  libXext,
-  libXdamage,
-  libXtst,
+  libxrandr,
+  libx11,
+  libxext,
+  libxdamage,
+  libxtst,
   libsm,
-  libXfixes,
+  libxfixes,
   coreutils,
   wrapQtAppsHook,
   icu63,
@@ -126,13 +126,13 @@ stdenv.mkDerivation rec {
     }"
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
-        libXrandr
-        libX11
-        libXext
-        libXdamage
-        libXtst
+        libxrandr
+        libx11
+        libxext
+        libxdamage
+        libxtst
         libsm
-        libXfixes
+        libxfixes
         dbus
         icu63
       ]
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index ea3e5d9556cd..5f759c7faaac 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -7,7 +7,7 @@
   qtwebkit,
   qtx11extras,
   lzo,
-  libX11,
+  libx11,
   wrapQtAppsHook,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     qtwebkit
     qtx11extras
     lzo
-    libX11
+    libx11
   ];
   nativeBuildInputs = [
     qmake
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index e98dd238b55f..fbde47cb85c3 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -11,11 +11,11 @@
   glib,
   gst_all_1,
   libGL,
-  libX11,
-  libXext,
-  libXmu,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxmu,
+  libxrandr,
+  libxrender,
 
   # For fixing up execution of /bin/ls, which is necessary for
   # product unlocking.
@@ -60,11 +60,11 @@ stdenv.mkDerivation {
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     libGL
-    libX11
-    libXext
-    libXmu
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxmu
+    libxrandr
+    libxrender
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index f15e934ded3c..b49fea2ef68d 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -10,7 +10,7 @@
   libsndfile,
   libsamplerate,
   libpulseaudio,
-  libXinerama,
+  libxinerama,
   gettext,
   pkg-config,
   alsa-lib,
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libXinerama
+    libxinerama
     gettext
     hamlib
     fltk_1_3
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index b9cbc8d0210b..4ff9ef72b682 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -9,7 +9,7 @@
   libusb1,
   soapysdr,
   mesa_glu,
-  libX11,
+  libx11,
   gnuplot,
   fltk,
   withGui ? false,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals withGui [
     fltk
-    libX11
+    libx11
     mesa_glu
     wxGTK32
   ];
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 67942ed248ad..d7215163a78b 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -9,7 +9,7 @@
   gtkglext,
   libjpeg_turbo,
   libtheora,
-  libXmu,
+  libxmu,
   lua,
   libGLU,
   libGL,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     perl
     libjpeg_turbo
     libtheora
-    libXmu
+    libxmu
     libGLU
     libGL
   ];
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 3856e9148aa9..5ce67c09a684 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -4,12 +4,12 @@
   fetchurl,
   wrapQtAppsHook,
   makeDesktopItem,
-  libXrender,
-  libXrandr,
-  libXcursor,
-  libX11,
-  libXext,
-  libXi,
+  libxrender,
+  libxrandr,
+  libxcursor,
+  libx11,
+  libxext,
+  libxi,
   libxcb,
   libGL,
   glib,
@@ -27,12 +27,12 @@
 
 let
   libPath = lib.makeLibraryPath [
-    libXrender
-    libXrandr
-    libXcursor
-    libX11
-    libXext
-    libXi
+    libxrender
+    libxrandr
+    libxcursor
+    libx11
+    libxext
+    libxi
     libxcb
     libGL
     glib
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   buildInputs = [
-    libXrender
-    libXrandr
-    libXcursor
-    libX11
-    libXext
-    libXi
+    libxrender
+    libxrandr
+    libxcursor
+    libx11
+    libxext
+    libxi
     libxcb
     libGL
     glib
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0af9390e8c3b..a59779aff60e 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -4,9 +4,9 @@
   fetchurl,
   bzip2,
   gfortran,
-  libX11,
-  libXmu,
-  libXt,
+  libx11,
+  libxmu,
+  libxt,
   libjpeg,
   libpng,
   libtiff,
@@ -73,10 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bzip2
     gfortran
-    libX11
-    libXmu
-    libXt
-    libXt
+    libx11
+    libxmu
+    libxt
+    libxt
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index dada6d1e8545..431126826a55 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -4,11 +4,11 @@
   fetchurl,
   fetchpatch,
   makeDesktopItem,
-  libX11,
-  libXt,
-  libXft,
-  libXrender,
-  libXext,
+  libx11,
+  libxt,
+  libxft,
+  libxrender,
+  libxext,
   ncurses,
   fontconfig,
   freetype,
@@ -66,18 +66,18 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXt
-    libXft
+    libx11
+    libxt
+    libxft
     ncurses # required to build the terminfo file
     fontconfig
     freetype
-    libXrender
+    libxrender
     libptytty
   ]
   ++ lib.optionals perlSupport [
     perl
-    libXext
+    libxext
   ]
   ++ lib.optional gdkPixbufSupport gdk-pixbuf;
 
@@ -90,8 +90,6 @@ stdenv.mkDerivation {
     (
       if emojiSupport then
         [
-          # the required patches to libXft are in nixpkgs by default, see
-          # ../../../servers/x11/xorg/overrides.nix
           (fetchPatchFromAUR {
             name = "enable-wide-glyphs.patch";
             package = "rxvt-unicode-truecolor-wide-glyphs";
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index c8808b66928c..df6d516e1cbe 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -5,15 +5,15 @@
   dbus,
   fontconfig,
   gccForLibs,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libinput,
   libxcb,
   libxkbcommon,
@@ -47,15 +47,15 @@ let
       dbus
       fontconfig
       gccForLibs
-      libX11
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXi
-      libXrandr
-      libXrender
-      libXtst
+      libx11
+      libxcomposite
+      libxcursor
+      libxdamage
+      libxext
+      libxi
+      libxrandr
+      libxrender
+      libxtst
       libinput
       libxcb
       libxkbcommon
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index adb9eebc91ba..618d690d7609 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -14,9 +14,9 @@
   libcec,
   libftdi1,
   libusb1,
-  libX11,
+  libx11,
   libxcb,
-  libXrandr,
+  libxrandr,
   python3,
   qtbase,
   qtserialport,
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     hidapi
     libftdi1
     libusb1
-    libX11
+    libx11
     libxcb
-    libXrandr
+    libxrandr
     flatbuffers
     protobuf
     mbedtls
diff --git a/pkgs/applications/video/jellyfin-desktop/default.nix b/pkgs/applications/video/jellyfin-desktop/default.nix
index 8c69b74ca47a..12ac1682972f 100644
--- a/pkgs/applications/video/jellyfin-desktop/default.nix
+++ b/pkgs/applications/video/jellyfin-desktop/default.nix
@@ -14,7 +14,7 @@
   mpvqt,
   libcec,
   SDL2,
-  libXrandr,
+  libxrandr,
   cacert,
   nix-update-script,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     SDL2
 
     # frame rate switching
-    libXrandr
+    libxrandr
     cacert
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix
index 66527511271b..c730a82499a6 100644
--- a/pkgs/applications/video/kaffeine/default.nix
+++ b/pkgs/applications/video/kaffeine/default.nix
@@ -6,10 +6,10 @@
   extra-cmake-modules,
   libvlc,
   libv4l,
-  libX11,
+  libx11,
   kidletime,
   kdelibs4support,
-  libXScrnSaver,
+  libxscrnsaver,
   wrapQtAppsHook,
   qtx11extras,
 }:
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libvlc
     libv4l
-    libX11
+    libx11
     kidletime
     qtx11extras
     kdelibs4support
-    libXScrnSaver
+    libxscrnsaver
   ];
 
   meta = {
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index b4a87cee6961..4a7392e6d4a3 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -92,17 +92,17 @@
   lirc,
   mesa-gl-headers,
   x11Support ? true,
-  libX11,
+  libx11,
   xorgproto,
-  libXt,
-  libXmu,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXfixes,
+  libxt,
+  libxmu,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxfixes,
   xdpyinfo,
-  libXdmcp,
+  libxdmcp,
   dbusSupport ? true,
   dbus,
   joystickSupport ? true,
@@ -350,16 +350,16 @@ stdenv.mkDerivation (
       zlib
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
       xorgproto
-      libXt
-      libXmu
-      libXext.dev
-      libXdmcp
-      libXinerama
-      libXrandr.dev
-      libXtst
-      libXfixes
+      libxt
+      libxmu
+      libxext.dev
+      libxdmcp
+      libxinerama
+      libxrandr.dev
+      libxtst
+      libxfixes
     ]
     ++ lib.optional dbusSupport dbus
     ++ lib.optional joystickSupport cwiid
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index fdf4f39b017d..b087115ccf6d 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -16,18 +16,18 @@
   fribidiSupport ? true,
   fribidi,
   x11Support ? true,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libGLU,
   libGL,
   xineramaSupport ? true,
-  libXinerama,
+  libxinerama,
   xvSupport ? true,
-  libXv,
+  libxv,
   alsaSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   screenSaverSupport ? true,
-  libXScrnSaver,
+  libxscrnsaver,
   vdpauSupport ? false,
   libvdpau,
   cddaSupport ? !stdenv.hostPlatform.isDarwin,
@@ -146,16 +146,16 @@ stdenv.mkDerivation {
   ++ lib.optional fontconfigSupport fontconfig
   ++ lib.optional fribidiSupport fribidi
   ++ lib.optionals x11Support [
-    libX11
-    libXext
+    libx11
+    libxext
     libGLU
     libGL
   ]
   ++ lib.optional alsaSupport alsa-lib
-  ++ lib.optional xvSupport libXv
+  ++ lib.optional xvSupport libxv
   ++ lib.optional theoraSupport libtheora
   ++ lib.optional cacaSupport libcaca
-  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional xineramaSupport libxinerama
   ++ lib.optional dvdnavSupport libdvdnav
   ++ lib.optional dvdreadSupport libdvdread
   ++ lib.optional bluraySupport libbluray
@@ -167,7 +167,7 @@ stdenv.mkDerivation {
   ]
   ++ lib.optional x264Support x264
   ++ lib.optional pulseSupport libpulseaudio
-  ++ lib.optional screenSaverSupport libXScrnSaver
+  ++ lib.optional screenSaverSupport libxscrnsaver
   ++ lib.optional lameSupport lame
   ++ lib.optional vdpauSupport libvdpau
   ++ lib.optional speexSupport speex
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 1fd414087914..483bf8df6d3b 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -19,13 +19,13 @@
   libsamplerate,
   libbluray,
   lzo,
-  libX11,
-  libXv,
-  libXrandr,
-  libXvMC,
-  libXinerama,
-  libXxf86vm,
-  libXmu,
+  libx11,
+  libxv,
+  libxrandr,
+  libxvmc,
+  libxinerama,
+  libxxf86vm,
+  libxmu,
   yasm,
   libuuid,
   taglib,
@@ -75,14 +75,14 @@ stdenv.mkDerivation rec {
     alsa-lib
     libpulseaudio
     fftwSinglePrec
-    libX11
-    libXv
-    libXrandr
-    libXvMC
-    libXmu
-    libXinerama
-    libXxf86vm
-    libXmu
+    libx11
+    libxv
+    libxrandr
+    libxvmc
+    libxmu
+    libxinerama
+    libxxf86vm
+    libxmu
     libuuid
     taglib
     exiv2
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index a79bb1e575ae..7889794a06c1 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@
   expat,
   extra-cmake-modules,
   glog,
-  libXdmcp,
+  libxdmcp,
   python312,
   wayland,
 }:
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     wayland
     glog
     ceres-solver
-    libXdmcp
+    libxdmcp
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 62e3f8a03e32..363137c4bdad 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -18,7 +18,7 @@
   libjack2,
   libxkbcommon,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   qtbase,
   qtsvg,
   speex,
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
     libv4l
     libxkbcommon
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     qtbase
     qtsvg
     speex
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 480f2b942416..96efc3f3d892 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -17,7 +17,7 @@
   qtbase,
   stdenv,
   websocketpp,
-  libXScrnSaver,
+  libxscrnsaver,
   libusb1,
   pkg-config,
   # #FIXME: Could not get cmake to pick up on these dependencies
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     procps
     qtbase
     websocketpp
-    libXScrnSaver
+    libxscrnsaver
     libusb1
   ];
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index f0c08e3012b2..b4546c885f8e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -9,9 +9,9 @@
   wayland-scanner,
   obs-studio,
   libffi,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libxcb,
   vulkan-headers,
   vulkan-loader,
@@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libffi
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libxcb
     vulkan-headers
     vulkan-loader
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/glinject.c \
       --replace "libGLX.so.0" "${lib.getLib libGL}/lib/libGLX.so.0" \
-      --replace "libX11.so.6" "${lib.getLib libX11}/lib/libX11.so.6" \
-      --replace "libX11-xcb.so.1" "${lib.getLib libX11}/lib/libX11-xcb.so.1" \
+      --replace "libX11.so.6" "${lib.getLib libx11}/lib/libX11.so.6" \
+      --replace "libX11-xcb.so.1" "${lib.getLib libx11}/lib/libX11-xcb.so.1" \
       --replace "libxcb-dri3.so.0" "${lib.getLib libxcb}/lib/libxcb-dri3.so.0" \
       --replace "libEGL.so.1" "${lib.getLib libGL}/lib/libEGL.so.1" \
       --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
index eeda8f3eb233..d77e494a71b0 100644
--- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
+++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
@@ -7,7 +7,7 @@
   ninja,
   wayland,
   obs-studio,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   buildInputs = [
     wayland
     obs-studio
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index c50603dc3355..e58e8475fe22 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -5,11 +5,11 @@
   alsa-lib,
   ffmpeg,
   libjack2,
-  libX11,
-  libXext,
-  libXinerama,
+  libx11,
+  libxext,
+  libxinerama,
   qtx11extras,
-  libXfixes,
+  libxfixes,
   libGLU,
   libGL,
   pkg-config,
@@ -60,10 +60,10 @@ stdenv.mkDerivation {
     alsa-lib
     ffmpeg
     libjack2
-    libX11
-    libXext
-    libXfixes
-    libXinerama
+    libx11
+    libxext
+    libxfixes
+    libxinerama
     libGLU
     libGL
     libpulseaudio
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
index 405d548bd7f2..65ee991e2b2f 100644
--- a/pkgs/applications/video/vdr/xineliboutput/default.nix
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -10,10 +10,10 @@
   libextractor,
   libglvnd,
   libGLU,
-  libX11,
-  libXext,
-  libXrender,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrender,
+  libxrandr,
   ffmpeg,
   avahi,
   wayland,
@@ -71,10 +71,10 @@ let
       libglvnd
       libGLU
       libvdpau
-      libXext
-      libXrandr
-      libXrender
-      libX11
+      libxext
+      libxrandr
+      libxrender
+      libx11
       vdr
       xine-lib
       avahi
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 2f12f6db51c0..49d1f1cae540 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -10,12 +10,12 @@
   pam,
   libxslt,
   libxml2,
-  libX11,
+  libx11,
   xorgproto,
-  libXext,
-  libXcursor,
-  libXfixes,
-  libXmu,
+  libxext,
+  libxcursor,
+  libxfixes,
+  libxmu,
   SDL2,
   libcap,
   libGL,
@@ -23,8 +23,8 @@
   libpng,
   glib,
   lvm2,
-  libXrandr,
-  libXinerama,
+  libxrandr,
+  libxinerama,
   libopus,
   libtpms,
   qt6,
@@ -144,9 +144,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     libxml2
     xorgproto
-    libX11
-    libXext
-    libXcursor
+    libx11
+    libxext
+    libxcursor
     libcap
     glib
     lvm2
@@ -156,8 +156,8 @@ stdenv.mkDerivation (finalAttrs: {
     pam
     makeself
     perl
-    libXmu
-    libXrandr
+    libxmu
+    libxrandr
     libpng
     libopus
     libtpms
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qttools
     qtscxml
-    libXinerama
+    libxinerama
     SDL2
     libGLU
   ]
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
       s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
 
     grep 'libXfixes\.so\.3'     src include -rI --files-with-match | xargs sed -i -e '
-      s@"libXfixes\.so\.3"@"${libXfixes.out}/lib/libXfixes.so.3"@g'
+      s@"libXfixes\.so\.3"@"${libxfixes.out}/lib/libXfixes.so.3"@g'
 
     grep 'libasound\.so\.2'     src include -rI --files-with-match | xargs sed -i -e '
       s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
index 06d245582a38..39b79420732b 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
@@ -5,11 +5,11 @@
   lib,
   pam,
   libxslt,
-  libXext,
-  libXcursor,
-  libXmu,
+  libxext,
+  libxcursor,
+  libxmu,
   glib,
-  libXrandr,
+  libxrandr,
   dbus,
   xz,
   pkg-config,
@@ -58,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus
     libxslt
-    libXext
-    libXcursor
+    libxext
+    libxcursor
     pam
-    libXmu
-    libXrandr
+    libxmu
+    libxrandr
   ];
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index f5a54b9c229b..3b2053fdca26 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -6,7 +6,7 @@
   libxcb,
   libxcb-keysyms,
   libxcb-wm,
-  libX11,
+  libx11,
   libxcb-util,
   xcbutilxrm,
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     libxcb
     libxcb-keysyms
     libxcb-wm
-    libX11
+    libx11
     libxcb-util
     xcbutilxrm
   ];
diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
index c238f048874b..0830c3ca4986 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxrandr,
+  libxrender,
   xorgproto,
   patches ? [ ],
 }:
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxrandr
+    libxrender
     xorgproto
   ];
 
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 30f79ff8d5ee..4aa1d9559d3b 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -7,8 +7,8 @@
   glib,
   gtkmm3,
   harfbuzz,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   makeWrapper,
   pcre2,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtkmm3
     harfbuzz
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     pcre2
     libxcb-cursor
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tiling X11 window manager written in modern C++";
     license = lib.licenses.bsd3;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
     mainProgram = "Hypr";
   };
 })
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index a104a4902897..7a2432747630 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -13,7 +13,7 @@
   libxcb-wm,
   xcbutilxrm,
   libstartup_notification,
-  libX11,
+  libx11,
   pcre2,
   libev,
   yajl,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilxrm
     libxkbcommon
     libstartup_notification
-    libX11
+    libx11
     pcre2
     libev
     yajl
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index bfa39114c90d..4de1997717c3 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -8,7 +8,7 @@
   libxcb-keysyms,
   libxcb-image,
   pam,
-  libX11,
+  libx11,
   libev,
   cairo,
   libxkbcommon,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     libxcb-keysyms
     libxcb-image
     pam
-    libX11
+    libx11
     libev
     cairo
     libxkbcommon
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 6918a964de26..e996b27c4657 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -10,7 +10,7 @@
   libxcb-image,
   xcbutilxrm,
   pam,
-  libX11,
+  libx11,
   libev,
   cairo,
   libxkbcommon,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     libxcb-image
     xcbutilxrm
     pam
-    libX11
+    libx11
     libev
     cairo
     libxkbcommon
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 098f7d4c3e62..2ecbea730741 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -7,8 +7,8 @@
   groff,
   libice,
   libsm,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libice
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
     lua
     gettext
     groff
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 79b932157728..e1c9c32e4e30 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -8,14 +8,14 @@
   fontconfig,
   freetype,
   gettext,
-  libX11,
-  libXau,
-  libXdmcp,
-  libXext,
-  libXft,
-  libXinerama,
-  libXmu,
-  libXpm,
+  libx11,
+  libxau,
+  libxdmcp,
+  libxext,
+  libxft,
+  libxinerama,
+  libxmu,
+  libxpm,
   libjpeg,
   libpng,
   librsvg,
@@ -50,14 +50,14 @@ stdenv.mkDerivation rec {
     expat
     fontconfig
     freetype
-    libX11
-    libXau
-    libXdmcp
-    libXext
-    libXft
-    libXinerama
-    libXmu
-    libXpm
+    libx11
+    libxau
+    libxdmcp
+    libxext
+    libxft
+    libxinerama
+    libxmu
+    libxpm
     libjpeg
     libpng
     librsvg
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index b240cfc8e9ef..ba57e5bae6f7 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   gettext,
-  libXpm,
+  libxpm,
   libGL,
   fltk,
   hicolor-icon-theme,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXpm
+    libxpm
     libGL
     fltk
     hicolor-icon-theme
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index d2fb54a330ea..f288bf4ee0fb 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   perl,
   libxcb,
-  libXft,
+  libxft,
 }:
 
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libxcb
-    libXft
+    libxft
     perl
   ];
 
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 56ffaa458cf4..d1fb089ca0f1 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchgit,
   xorgproto,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   customConfig ? null,
   patches ? [ ],
 }:
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   makeFlags = [ "CC:=$(CC)" ];
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index 8728631bf4e1..89f8308802cc 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -5,7 +5,7 @@
   lib,
   libice,
   libsm,
-  libX11,
+  libx11,
   stdenv,
   writeText,
 }:
@@ -58,7 +58,7 @@
           prependToVar dotnetRuntimeDeps \
             "${lib.getLib libice}" \
             "${lib.getLib libsm}" \
-            "${lib.getLib libX11}"
+            "${lib.getLib libx11}"
         '';
       }
     );
diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 6a49d1a9525d..23e47251488a 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -6,7 +6,7 @@
   autoreconfHook,
   allegro,
   libsamplerate,
-  libX11,
+  libx11,
   SDL2,
   SDL2_mixer,
   readline,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     allegro
     libsamplerate
-    libX11
+    libx11
     SDL2
     SDL2_mixer
     readline
diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix
index 57e3c76dea8b..c2b1b4526021 100644
--- a/pkgs/by-name/_1/_1password-gui/linux.nix
+++ b/pkgs/by-name/_1/_1password-gui/linux.nix
@@ -18,12 +18,12 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libdrm,
   libxcb,
   libxkbcommon,
@@ -82,12 +82,12 @@ stdenv.mkDerivation {
           gdk-pixbuf
           glib
           gtk3
-          libX11
-          libXcomposite
-          libXdamage
-          libXext
-          libXfixes
-          libXrandr
+          libx11
+          libxcomposite
+          libxdamage
+          libxext
+          libxfixes
+          libxrandr
           libdrm
           libxcb
           libxkbcommon
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 5f098b8518fd..4cccacc22e35 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -27,7 +27,7 @@
   libogg,
   libopus,
   libvorbis,
-  libX11,
+  libx11,
   opusfile,
   sdl_gamecontrollerdb,
   makeDesktopItem,
@@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libpulseaudio
     libvorbis
-    libX11
+    libx11
     libzip
     nlohmann_json
     (lib.getDev opusfile)
diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix
index bb297d064b63..27b16a398887 100644
--- a/pkgs/by-name/_4/_4d-minesweeper/package.nix
+++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix
@@ -9,14 +9,14 @@
   godot3-export-templates,
   godot3-headless,
   libGLU,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   libpulseaudio,
   zlib,
@@ -43,14 +43,14 @@ stdenv.mkDerivation {
     gcc-unwrapped.lib
     git
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     libpulseaudio
     zlib
diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 1d5b56aba11d..7e29940cca1e 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -6,8 +6,8 @@
   pkg-config,
   meson,
   ninja,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   passthru.updateScript = nix-update-script {
@@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "9menu";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = libX11.meta.platforms;
+    platforms = libx11.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/a-/a-keys-path/package.nix b/pkgs/by-name/a-/a-keys-path/package.nix
index c8e9c37a3836..f8110e3b1cb8 100644
--- a/pkgs/by-name/a-/a-keys-path/package.nix
+++ b/pkgs/by-name/a-/a-keys-path/package.nix
@@ -10,13 +10,13 @@
   alsa-lib,
   godot3-export-templates,
   godot3-headless,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   writableTmpDirAsHomeHook,
 }:
@@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
   ];
 
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index fdde52c8e985..825d3dbe8c95 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -4,13 +4,13 @@
   buildGoModule,
   alsa-lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   go-licenses,
   pkg-config,
   zip,
@@ -37,13 +37,13 @@ buildGoModule rec {
   buildInputs = [
     alsa-lib
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix
index 28ec3c649014..5ca4ce5b5227 100644
--- a/pkgs/by-name/ac/ace-of-penguins/package.nix
+++ b/pkgs/by-name/ac/ace-of-penguins/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   copyDesktopItems,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libpng,
   makeDesktopItem,
   zlib,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
     libpng
     zlib
   ];
diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix
index 1eadcfd29e26..041939ce0505 100644
--- a/pkgs/by-name/ad/adlplug/package.nix
+++ b/pkgs/by-name/ad/adlplug/package.nix
@@ -9,11 +9,11 @@
   liblo,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
 
   # Enabling JACK requires a JACK server at runtime, no fallback mechanism
   withJack ? false,
@@ -95,11 +95,11 @@ stdenv.mkDerivation {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ]
   ++ lib.optionals withJack [ libjack2 ];
 
diff --git a/pkgs/by-name/ae/aeolus/package.nix b/pkgs/by-name/ae/aeolus/package.nix
index 171761c85c27..e3cc65c2494c 100644
--- a/pkgs/by-name/ae/aeolus/package.nix
+++ b/pkgs/by-name/ae/aeolus/package.nix
@@ -7,8 +7,8 @@
   alsa-lib,
   libjack2,
   libclxclient,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   readline,
   aeolus-stops,
 }:
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     libclxclient
-    libX11
-    libXft
+    libx11
+    libxft
     readline
   ];
 
diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix
index 7a0abfdc3b82..fa67a7d04c53 100644
--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   lv2,
-  libX11,
+  libx11,
   libGL,
   libGLU,
   libgbm,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     lv2
-    libX11
+    libx11
     libGL
     libGLU
     libgbm
diff --git a/pkgs/by-name/ag/agg/package.nix b/pkgs/by-name/ag/agg/package.nix
index 9eb7dd218ac8..698b2ff62037 100644
--- a/pkgs/by-name/ag/agg/package.nix
+++ b/pkgs/by-name/ag/agg/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   freetype,
   SDL,
-  libX11,
+  libx11,
 }:
 let
   stdenv = gccStdenv;
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   postPatch = ''
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-examples=no"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "--x-includes=${lib.getDev libX11}/include"
-    "--x-libraries=${lib.getLib libX11}/lib"
+    "--x-includes=${lib.getDev libx11}/include"
+    "--x-libraries=${lib.getLib libx11}/lib"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index 73f838a1f1e4..3e21da8fefb4 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -8,10 +8,10 @@
   wayland,
   wayland-protocols,
   libxkbcommon,
-  libX11,
-  libXrandr,
-  libXi,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxi,
+  libxcursor,
   udev,
   alsa-lib,
   stdenv,
@@ -36,10 +36,10 @@ let
         (lib.getLib stdenv.cc.cc)
         libxkbcommon
         libxcb
-        libX11
-        libXcursor
-        libXrandr
-        libXi
+        libx11
+        libxcursor
+        libxrandr
+        libxi
         vulkan-loader
         libGL
       ];
@@ -76,10 +76,10 @@ rustPlatform.buildRustPackage {
     wayland
     wayland-protocols
     libxkbcommon
-    libX11
-    libXrandr
-    libXi
-    libXcursor
+    libx11
+    libxrandr
+    libxi
+    libxcursor
   ];
   nativeBuildInputs = [
     cmake
@@ -105,10 +105,10 @@ rustPlatform.buildRustPackage {
         fontconfig
         freetype
         libxkbcommon
-        libX11
-        libXrandr
-        libXi
-        libXcursor
+        libx11
+        libxrandr
+        libxi
+        libxcursor
       ];
     in
     ''
diff --git a/pkgs/by-name/ai/airwave/package.nix b/pkgs/by-name/ai/airwave/package.nix
index 9afd4a33d6d2..4f2a4e455157 100644
--- a/pkgs/by-name/ai/airwave/package.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -6,7 +6,7 @@
   cmake,
   makeWrapper,
   file,
-  libX11,
+  libx11,
   qt5,
   vst2-sdk,
 }:
@@ -33,7 +33,7 @@ multiStdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     file
-    libX11
+    libx11
     qt5.qtbase
     wine-wow64
   ];
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 49d7044c5835..7bd034f88a31 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -7,8 +7,8 @@
   libjpeg,
   libogg,
   libvorbis,
-  libX11,
-  libXxf86vm,
+  libx11,
+  libxxf86vm,
   openal,
   pkg-config,
   stdenv,
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     libjpeg
     libogg
     libvorbis
-    libX11
-    libXxf86vm
+    libx11
+    libxxf86vm
     openal
   ];
 
diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix
index 1090c1b81474..a2d43b1f74f9 100644
--- a/pkgs/by-name/al/alliance/package.nix
+++ b/pkgs/by-name/al/alliance/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   xorgproto,
   motif,
-  libX11,
-  libXt,
-  libXpm,
+  libx11,
+  libxt,
+  libxpm,
   bison,
   flex,
   automake,
@@ -38,9 +38,9 @@ stdenv.mkDerivation {
   buildInputs = [
     xorgproto
     motif
-    libX11
-    libXt
-    libXpm
+    libx11
+    libxt
+    libxpm
     bison
   ];
 
diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix
index 9938810d1196..e7c8f1c004ba 100644
--- a/pkgs/by-name/al/alock/package.nix
+++ b/pkgs/by-name/al/alock/package.nix
@@ -5,10 +5,10 @@
   gitUpdater,
   pkg-config,
   autoreconfHook,
-  libX11,
+  libx11,
   pam,
   libgcrypt,
-  libXrender,
+  libxrender,
   imlib2,
 }:
 
@@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
   buildInputs = [
-    libX11
+    libx11
     pam
     libgcrypt
-    libXrender
+    libxrender
     imlib2
   ];
 
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index cad1f3853cbd..e575afc2406c 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -15,10 +15,10 @@
   gmp,
   jack2,
   lame,
-  libX11,
-  libXi,
-  libXrandr,
-  libXcursor,
+  libx11,
+  libxi,
+  libxrandr,
+  libxcursor,
   libdrm,
   libglvnd,
   libogg,
@@ -111,10 +111,10 @@ rustPlatform.buildRustPackage rec {
     gmp
     jack2
     lame
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     libdrm
     libglvnd
     libogg
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index c2d11097735e..2c406b571010 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -3,14 +3,14 @@
   rustPlatform,
   fetchFromGitHub,
   libdrm,
-  libX11,
+  libx11,
   libGL,
   wayland,
   wayland-protocols,
   libxkbcommon,
-  libXrandr,
-  libXi,
-  libXcursor,
+  libxrandr,
+  libxi,
+  libxcursor,
   nix-update-script,
 }:
 
@@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libdrm
-    libX11
+    libx11
     libGL
     wayland
     wayland-protocols
     libxkbcommon
-    libXrandr
-    libXi
-    libXcursor
+    libxrandr
+    libxi
+    libxcursor
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 9f559ab9ca77..92704f390d0b 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -19,7 +19,7 @@
   libpng,
   pkg-config,
   makeWrapper,
-  libX11,
+  libx11,
 }:
 
 # daemon and client are not build monolithic
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost186
   ]
   ++ lib.optional httpServer libpng
-  ++ lib.optional client libX11;
+  ++ lib.optional client libx11;
 
   cmakeFlags = [
     "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}"
diff --git a/pkgs/by-name/an/andyetitmoves/package.nix b/pkgs/by-name/an/andyetitmoves/package.nix
index 7a7d60bd0691..5f680c234fd9 100644
--- a/pkgs/by-name/an/andyetitmoves/package.nix
+++ b/pkgs/by-name/an/andyetitmoves/package.nix
@@ -6,10 +6,10 @@
   libogg,
   libtheora,
   SDL,
-  libXft,
+  libxft,
   SDL_image,
   zlib,
-  libX11,
+  libx11,
   libpng,
   openal,
   runtimeShell,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
     libogg
     libtheora
     SDL
-    libXft
+    libxft
     SDL_image
     zlib
-    libX11
+    libx11
     libpng
     openal
   ];
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 54e8bfe7965e..b8c7d0ee2217 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -7,8 +7,8 @@
   autoPatchelfHook,
   jetbrains, # Requird by upstream due to JCEF dependency
   fontconfig,
-  libXinerama,
-  libXrandr,
+  libxinerama,
+  libxrandr,
   file,
   gtk3,
   glib,
@@ -79,8 +79,8 @@
   boost,
   thrift,
   libGL,
-  libX11,
-  libXdamage,
+  libx11,
+  libxdamage,
   nss,
   nspr,
 }:
@@ -157,8 +157,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libXinerama
-    libXrandr
+    libxinerama
+    libxrandr
     file
     shine
     libmpeg2
@@ -230,8 +230,8 @@ stdenv.mkDerivation (finalAttrs: {
     nss
     nspr
     libGL
-    libX11
-    libXdamage
+    libx11
+    libxdamage
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 13610ce0f511..27f523a3a743 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -41,10 +41,10 @@
   libsysprof-capture,
   libthai,
   libwebp,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libxml2,
-  libXtst,
+  libxtst,
   llvmPackages,
   openexr,
   openjpeg,
@@ -149,10 +149,10 @@ stdenv.mkDerivation {
     libsysprof-capture
     libthai
     libwebp
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libxml2
-    libXtst
+    libxtst
     openexr
     openjpeg
     osm-gps-map
diff --git a/pkgs/by-name/an/anthy/package.nix b/pkgs/by-name/an/anthy/package.nix
index c47b6f7d08b6..a3c3153c1c40 100644
--- a/pkgs/by-name/an/anthy/package.nix
+++ b/pkgs/by-name/an/anthy/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
-    homepage = "https://anthy.osdn.jp/";
+    homepage = "https://web.archive.org/web/20250404073626/https://osdn.net/projects/anthy/";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index e74330edf20d..afe7bb297fd5 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
   libGL,
   libGLU,
   libglut,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ autoreconfHook ];
 
   buildInputs = [
-    libX11
+    libx11
     libGLU
     libGL
     libglut
diff --git a/pkgs/by-name/ap/apitrace/package.nix b/pkgs/by-name/ap/apitrace/package.nix
index 9319b421cf23..86aa5a92a8d0 100644
--- a/pkgs/by-name/ap/apitrace/package.nix
+++ b/pkgs/by-name/ap/apitrace/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   procps,
   python3,
   libdwarf,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   # LD_PRELOAD wrappers need to be statically linked to work against all kinds
   # of games -- so it's fine to use e.g. bundled snappy.
   buildInputs = [
-    libX11
+    libx11
     procps
     libdwarf
     gtest
diff --git a/pkgs/by-name/ap/apotris/package.nix b/pkgs/by-name/ap/apotris/package.nix
index 4b09797fba01..9eb49286d147 100644
--- a/pkgs/by-name/ap/apotris/package.nix
+++ b/pkgs/by-name/ap/apotris/package.nix
@@ -15,12 +15,12 @@
   SDL2,
   SDL2_mixer,
   libopenmpt,
-  libXrandr,
-  libXext,
-  libXfixes,
-  libXcursor,
-  libXi,
-  libXScrnSaver,
+  libxrandr,
+  libxext,
+  libxfixes,
+  libxcursor,
+  libxi,
+  libxscrnsaver,
   makeDesktopItem,
 }:
 
@@ -58,12 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2_mixer
     libopenmpt
     SDL2
-    libXrandr
-    libXext
-    libXfixes
-    libXcursor
-    libXi
-    libXScrnSaver
+    libxrandr
+    libxext
+    libxfixes
+    libxcursor
+    libxi
+    libxscrnsaver
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/ap/applewin/package.nix b/pkgs/by-name/ap/applewin/package.nix
index db41883579d4..2ee654c6b34c 100644
--- a/pkgs/by-name/ap/applewin/package.nix
+++ b/pkgs/by-name/ap/applewin/package.nix
@@ -24,8 +24,8 @@
   xz,
   libsysprof-capture,
   lerc,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   qt6Packages,
   qt6,
   enableQt6 ? true,
@@ -75,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libwebp
     libpng
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals enableQt6 [
     qt6Packages.qtbase
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 627790626b4d..3585c8938eb8 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -4,7 +4,7 @@
   autoreconfHook,
   fetchFromGitHub,
   libGLU,
-  libX11,
+  libx11,
   pkg-config,
   stdenv,
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGLU
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 75d471de2e3a..3425e72ab31a 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -13,11 +13,11 @@
   jbig2dec,
   leptonica,
   libGL,
-  libX11,
-  libXau,
-  libXcomposite,
-  libXdmcp,
-  libXfixes,
+  libx11,
+  libxau,
+  libxcomposite,
+  libxdmcp,
+  libxfixes,
   libdrm,
   libffi,
   libjpeg,
@@ -81,11 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
     jbig2dec
     leptonica
     libGL
-    libX11
-    libXau
-    libXcomposite
-    libXdmcp
-    libXfixes
+    libx11
+    libxau
+    libxcomposite
+    libxdmcp
+    libxfixes
     libdrm
     libffi
     libjpeg
diff --git a/pkgs/by-name/ar/arena/package.nix b/pkgs/by-name/ar/arena/package.nix
index 849c1810c2af..5c4cbac0783d 100644
--- a/pkgs/by-name/ar/arena/package.nix
+++ b/pkgs/by-name/ar/arena/package.nix
@@ -8,7 +8,7 @@
   cairo,
   atk,
   gdk-pixbuf,
-  libX11,
+  libx11,
 }:
 
 # Arena is free software in the sense of "free beer" but not as in "free
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     cairo
     atk
     gdk-pixbuf
-    libX11
+    libx11
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index c02e63559da2..d4f8f2c97015 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -8,8 +8,8 @@
   gtksourceview3,
   libGL,
   libGLU,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libpulseaudio,
   libretro-shaders-slang,
@@ -62,8 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview3
     libGL
     libGLU
-    libX11
-    libXv
+    libx11
+    libxv
     libpulseaudio
     openal
     udev
diff --git a/pkgs/by-name/ar/argyllcms/package.nix b/pkgs/by-name/ar/argyllcms/package.nix
index 2fa6337ae613..2b04d47a936b 100644
--- a/pkgs/by-name/ar/argyllcms/package.nix
+++ b/pkgs/by-name/ar/argyllcms/package.nix
@@ -3,19 +3,19 @@
   fetchzip,
   jam,
   unzip,
-  libX11,
-  libXxf86vm,
-  libXrandr,
-  libXinerama,
-  libXrender,
-  libXext,
+  libx11,
+  libxxf86vm,
+  libxrandr,
+  libxinerama,
+  libxrender,
+  libxext,
   libtiff,
   libjpeg,
   libpng,
-  libXScrnSaver,
+  libxscrnsaver,
   writeText,
-  libXdmcp,
-  libXau,
+  libxdmcp,
+  libxau,
   lib,
   openssl,
   buildPackages,
@@ -136,15 +136,15 @@ stdenv.mkDerivation rec {
     libtiff
     libjpeg
     libpng
-    libX11
-    libXxf86vm
-    libXrandr
-    libXinerama
-    libXext
-    libXrender
-    libXScrnSaver
-    libXdmcp
-    libXau
+    libx11
+    libxxf86vm
+    libxrandr
+    libxinerama
+    libxext
+    libxrender
+    libxscrnsaver
+    libxdmcp
+    libxau
     openssl
   ];
 
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index 78d217979804..fdbd59665d68 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -23,7 +23,7 @@
   libGL,
   libGLU,
   libpng,
-  libX11,
+  libx11,
   libxml2,
   protobuf,
   xvfb-run,
@@ -60,7 +60,7 @@ let
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
             libGLU
-            libX11
+            libx11
             libpng
             SDL
             SDL_image
@@ -87,7 +87,7 @@ let
             freetype
             libGL
             libGLU
-            libX11
+            libx11
             SDL2
             SDL2_image
             SDL2_mixer
@@ -107,7 +107,7 @@ let
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
             libGLU
-            libX11
+            libx11
             libpng
             SDL
             SDL_image
diff --git a/pkgs/by-name/ar/arrow/package.nix b/pkgs/by-name/ar/arrow/package.nix
index 576f80f03c53..bd9bb6f4b52f 100644
--- a/pkgs/by-name/ar/arrow/package.nix
+++ b/pkgs/by-name/ar/arrow/package.nix
@@ -6,11 +6,11 @@
   alsa-lib,
   libGL,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   udev,
   vulkan-loader,
   autoPatchelfHook,
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libGL
     libpulseaudio
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxrandr
     udev
     vulkan-loader
   ];
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 72ab394c00dc..d98a6c2e98c5 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -12,13 +12,13 @@
   lerc,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
   pixman,
   libpthread-stubs,
   gtkmm3,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lcms2,
   libraw,
   libiptcdata,
@@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: {
     lerc
     libxkbcommon
     libepoxy
-    libXtst
+    libxtst
     pixman
     libpthread-stubs
     gtkmm3
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     lcms2
     libraw
     libiptcdata
diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 68694583fe50..650b83b4dda1 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -6,7 +6,7 @@
   cmake,
   libjack2,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxshmfence,
   libsndfile,
   lv2,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairomm
     libjack2
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxshmfence
     libsndfile
     lv2
diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 5b40efd86c7d..4c3ead38f4e8 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -17,13 +17,13 @@
   libjpeg,
   libpng,
   libwebp,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxxf86vm,
   libxcb,
-  libXrandr,
+  libxrandr,
   ninja,
   pcre2,
   pixman,
@@ -87,13 +87,13 @@ clangStdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libwebp
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxxf86vm
     libxcb
-    libXrandr
+    libxrandr
     pcre2
     pixman
     skia-aseprite
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index c5d31f1300cd..5a4e9393f4ed 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -11,7 +11,7 @@
   SDL2,
   SDL2_image,
   libGL,
-  libX11,
+  libx11,
   makeWrapper,
   zlib,
   file,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     libGL
-    libX11
+    libx11
     libogg
     libvorbis
   ];
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index b37dd3f9bdcd..9d352c0b3fe9 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -17,11 +17,11 @@
   dbus,
   glib,
   dconf,
-  libX11,
+  libx11,
   libxml2,
-  libXtst,
-  libXi,
-  libXext,
+  libxtst,
+  libxi,
+  libxext,
   gnome,
   systemdLibs,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
@@ -55,13 +55,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxml2
     # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
-    libXtst
-    libXi
-    # libXext is a transitive dependency of libXi
-    libXext
+    libxtst
+    libxi
+    # libxext is a transitive dependency of libxi
+    libxext
   ]
   ++ lib.optionals systemdSupport [
     # libsystemd is a needed for dbus-broker support
diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix
index 367feef63db6..e19b8730b8a0 100644
--- a/pkgs/by-name/at/atari800/package.nix
+++ b/pkgs/by-name/at/atari800/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   readline,
   zlib,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
     libGL
     libGLU
-    libX11
+    libx11
     readline
     zlib
   ];
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index d31bb3b4f897..fde9cae8f43a 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -7,8 +7,8 @@
   gcc-unwrapped,
   libice,
   libsm,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     gcc-unwrapped
     libice
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   postFixup = ''
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index b876eadd8880..9dd69e2093b0 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -40,8 +40,8 @@
   at-spi2-core,
   dbus,
   libepoxy,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libpthread-stubs,
   libsbsms_2_3_0,
   libselinux,
@@ -136,8 +136,8 @@ stdenv.mkDerivation (finalAttrs: {
     at-spi2-core
     dbus
     libepoxy
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libpthread-stubs
     libxkbcommon
     libselinux
diff --git a/pkgs/by-name/au/autocutsel/package.nix b/pkgs/by-name/au/autocutsel/package.nix
index 0c33c150d2f0..9a38dbb09557 100644
--- a/pkgs/by-name/au/autocutsel/package.nix
+++ b/pkgs/by-name/au/autocutsel/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXaw,
+  libx11,
+  libxaw,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXaw
+    libx11
+    libxaw
   ];
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 3c18fc19fd7a..a9f0d6f49df6 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -7,11 +7,11 @@
   lib,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   liberation_ttf,
   makeFontsConf,
   nodejs,
@@ -85,11 +85,11 @@ stdenvNoCC.mkDerivation (
         substituteInPlace src/Avalonia.X11/SMLib.cs \
           --replace-fail '"libSM.so.6"' '"${lib.getLib libsm}/lib/libSM.so.6"'
         substituteInPlace src/Avalonia.X11/XLib.cs \
-          --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
-          --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
-          --replace-fail '"libXext.so.6"' '"${lib.getLib libXext}/lib/libXext.so.6"' \
-          --replace-fail '"libXi.so.6"' '"${lib.getLib libXi}/lib/libXi.so.6"' \
-          --replace-fail '"libXcursor.so.1"' '"${lib.getLib libXcursor}/lib/libXcursor.so.1"'
+          --replace-fail '"libX11.so.6"' '"${lib.getLib libx11}/lib/libX11.so.6"' \
+          --replace-fail '"libXrandr.so.2"' '"${lib.getLib libxrandr}/lib/libXrandr.so.2"' \
+          --replace-fail '"libXext.so.6"' '"${lib.getLib libxext}/lib/libXext.so.6"' \
+          --replace-fail '"libXi.so.6"' '"${lib.getLib libxi}/lib/libXi.so.6"' \
+          --replace-fail '"libXcursor.so.1"' '"${lib.getLib libxcursor}/lib/libXcursor.so.1"'
 
         # from RestoreAdditionalProjectSources, which isn't supported by nuget-to-json
         dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json
diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index de00a6caac59..e08c57ac3b85 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -9,14 +9,14 @@
   gettext,
   libvdpau,
   libva,
-  libXv,
+  libxv,
   sqlite,
   yasm,
   freetype,
   fontconfig,
   fribidi,
   makeWrapper,
-  libXext,
+  libxext,
   libGLU,
   alsa-lib,
   withX265 ? true,
@@ -109,13 +109,13 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     libvdpau
     libva
-    libXv
+    libxv
     sqlite
     fribidi
     fontconfig
     freetype
     alsa-lib
-    libXext
+    libxext
     libGLU
   ]
   ++ lib.optional withX264 x264
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       wrapWith =
         makeWrapper: filename:
-        "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+        "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libxext}/lib";
       wrapQtApp = wrapWith "wrapQtApp";
       wrapProgram = wrapWith "wrapProgram";
     in
diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 31ebda65c6ba..585f0d2e0f06 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -8,10 +8,10 @@
   ninja,
   pkg-config,
   libiconv,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
   freetype,
   fontconfig,
   libjpeg,
@@ -41,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXext
-    libXi
+    libx11
+    libxcursor
+    libxext
+    libxi
     freetype
     fontconfig
     libjpeg
diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix
index 2be9b632bf7c..bbdf31e2a98a 100644
--- a/pkgs/by-name/ba/banana-accounting/package.nix
+++ b/pkgs/by-name/ba/banana-accounting/package.nix
@@ -9,7 +9,7 @@
   gmp,
   gtk3,
   libGL,
-  libX11,
+  libx11,
   libgcrypt,
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     (lib.getLib stdenv.cc.cc)
     libGL
-    libX11
+    libx11
     libgcrypt
   ];
 
diff --git a/pkgs/by-name/ba/baudline/package.nix b/pkgs/by-name/ba/baudline/package.nix
index 31b6a1c573be..5c7efbe4cc95 100644
--- a/pkgs/by-name/ba/baudline/package.nix
+++ b/pkgs/by-name/ba/baudline/package.nix
@@ -2,22 +2,22 @@
   lib,
   stdenv,
   fetchurl,
-  libXmu,
-  libXt,
-  libX11,
-  libXext,
-  libXxf86vm,
+  libxmu,
+  libxt,
+  libx11,
+  libxext,
+  libxxf86vm,
   libjack2,
   makeWrapper,
 }:
 
 let
   rpath = lib.makeLibraryPath [
-    libXmu
-    libXt
-    libX11
-    libXext
-    libXxf86vm
+    libxmu
+    libxt
+    libx11
+    libxext
+    libxxf86vm
     libjack2
   ];
 in
diff --git a/pkgs/by-name/bc/bchoppr/package.nix b/pkgs/by-name/bc/bchoppr/package.nix
index 0a32a4b8578a..b2a2813b7c99 100644
--- a/pkgs/by-name/bc/bchoppr/package.nix
+++ b/pkgs/by-name/bc/bchoppr/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   lv2,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix
index c575769443fd..145f5a99b4a8 100644
--- a/pkgs/by-name/be/bepass/package.nix
+++ b/pkgs/by-name/be/bepass/package.nix
@@ -6,12 +6,12 @@
   pkg-config,
   glfw,
   libxft,
-  libXcursor,
-  libXrandr,
-  libXinerama,
+  libxcursor,
+  libxrandr,
+  libxinerama,
   xinput,
-  libXi,
-  libXxf86vm,
+  libxi,
+  libxxf86vm,
 }:
 buildGoModule rec {
   pname = "bepass";
@@ -34,12 +34,12 @@ buildGoModule rec {
   buildInputs = lib.optionals enableGUI [
     glfw
     libxft
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
     xinput
-    libXxf86vm
+    libxxf86vm
   ];
 
   ldflags = [
diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix
index 5f35e5e9e3fa..84eb367acb55 100644
--- a/pkgs/by-name/be/berry/package.nix
+++ b/pkgs/by-name/be/berry/package.nix
@@ -5,10 +5,10 @@
   copyDesktopItems,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
   makeDesktopItem,
   pkg-config,
   which,
@@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXft
-    libXinerama
+    libx11
+    libxext
+    libxft
+    libxinerama
     fontconfig
     freetype
   ];
@@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "berry";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 36a29a13c4d7..36ed0ff97e27 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -13,12 +13,12 @@
   freetype,
   jsoncpp,
   libusb1,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
-  libXScrnSaver,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
+  libxscrnsaver,
   libGL,
   libxcb,
   vst2-sdk,
@@ -95,12 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
-    libXScrnSaver
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
+    libxscrnsaver
     curl
     gtk3
     webkitgtk_4_1
@@ -145,12 +145,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${
     lib.makeLibraryPath [
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      libXScrnSaver
+      libx11
+      libxrandr
+      libxinerama
+      libxext
+      libxcursor
+      libxscrnsaver
     ]
   }";
 
diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index fbc3bf55cddb..c094c2794fc9 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXft,
-  libXrandr,
+  libx11,
+  libxft,
+  libxrandr,
   gitUpdater,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrandr
+    libx11
+    libxft
+    libxrandr
   ];
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/bg/bgs/package.nix b/pkgs/by-name/bg/bgs/package.nix
index 08cf1f52b143..905576f50795 100644
--- a/pkgs/by-name/bg/bgs/package.nix
+++ b/pkgs/by-name/bg/bgs/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
   imlib2,
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
     imlib2
   ];
 
diff --git a/pkgs/by-name/bi/bink-player/package.nix b/pkgs/by-name/bi/bink-player/package.nix
index 5bd2442cb32e..2a9cbb51f03a 100644
--- a/pkgs/by-name/bi/bink-player/package.nix
+++ b/pkgs/by-name/bi/bink-player/package.nix
@@ -5,7 +5,7 @@
   autoPatchelfHook,
   p7zip,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     stdenv.cc.cc.lib
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix
index e72a29221607..2176e8f088e7 100644
--- a/pkgs/by-name/bj/bjumblr/package.nix
+++ b/pkgs/by-name/bj/bjumblr/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   cairo,
   lv2,
   pkg-config,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     cairo
     lv2
     libsndfile
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 4c53c3a5afd0..892c28d1c530 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -28,11 +28,11 @@
   lib,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXi,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxi,
+  libxrender,
+  libxxf86vm,
   libdecor,
   libepoxy,
   libffi,
@@ -280,11 +280,11 @@ stdenv'.mkDerivation (finalAttrs: {
       [
         libGL
         libGLU
-        libX11
-        libXext
-        libXi
-        libXrender
-        libXxf86vm
+        libx11
+        libxext
+        libxi
+        libxrender
+        libxxf86vm
         openal
         openxr-loader
       ]
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index 28333e1f2cac..eb6e32c15ed1 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -12,7 +12,7 @@
   darwin,
   fontconfig,
   libgdiplus,
-  libXrandr,
+  libxrandr,
   glib,
   writeShellScriptBin,
   blender,
@@ -89,7 +89,7 @@ buildDotnetModule rec {
     pcre
     libgdiplus
     glib
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];
 
diff --git a/pkgs/by-name/bl/bloodspilot-client/package.nix b/pkgs/by-name/bl/bloodspilot-client/package.nix
index 7436908119bb..d2b92acf661a 100644
--- a/pkgs/by-name/bl/bloodspilot-client/package.nix
+++ b/pkgs/by-name/bl/bloodspilot-client/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   SDL,
   libGLU,
   libGL,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./bloodspilot-sdl-window-fix.patch ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL
     SDL_ttf
     SDL_image
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index d8e70610d742..b131da910a02 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   alsa-lib,
   nss,
-  libXdamage,
+  libxdamage,
   libdrm,
   libgbm,
   libxshmfence,
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     nss
-    libXdamage
+    libxdamage
     libdrm
     libgbm
     libxshmfence
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index fc9591d9ecfd..d5d1ac88333a 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -6,7 +6,7 @@
   autoconf,
   automake,
   fontconfig,
-  libX11,
+  libx11,
   perl,
   flex,
   bison,
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = yices.buildInputs ++ [
     fontconfig
-    libX11 # tcltk
+    libx11 # tcltk
     tcl
     tk
     which
diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix
index 5ee5ebf58c95..0ab73abaebc2 100644
--- a/pkgs/by-name/bl/blugon/package.nix
+++ b/pkgs/by-name/bl/blugon/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   python3,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     python3
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   # Remove at next release
diff --git a/pkgs/by-name/bo/bobcat/package.nix b/pkgs/by-name/bo/bobcat/package.nix
index 115f211aa1b9..85f3d094b8fe 100644
--- a/pkgs/by-name/bo/bobcat/package.nix
+++ b/pkgs/by-name/bo/bobcat/package.nix
@@ -5,7 +5,7 @@
   icmake,
   yodl,
   libmilter,
-  libX11,
+  libx11,
   openssl,
   readline,
   util-linux,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libmilter
-    libX11
+    libx11
     openssl
     readline
     util-linux
diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index 8a8859546f98..6b8ff52a4150 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -8,8 +8,8 @@
   gtk3,
   libGL,
   libGLU,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libtool,
   ncurses,
   pkg-config,
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableX11 [
     libGL
     libGLU
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 1825c41d476c..056029987a62 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -9,8 +9,8 @@
   curl,
   libGLU,
   libGL,
-  libXmu,
-  libXi,
+  libxmu,
+  libxi,
   libglut,
   libjpeg,
   libtool,
@@ -19,9 +19,9 @@
   sqlite,
   gtk3,
   patchelf,
-  libXScrnSaver,
+  libxscrnsaver,
   libnotify,
-  libX11,
+  libx11,
   libxcb,
   headless ? false,
 }:
@@ -54,15 +54,15 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (!headless) [
     libGLU
     libGL
-    libXmu
-    libXi
+    libxmu
+    libxi
     libglut
     libjpeg
     wxGTK32
     gtk3
-    libXScrnSaver
+    libxscrnsaver
     libnotify
-    libX11
+    libx11
     libxcb
     libxcb-util
   ];
diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix
index e1ee65d74f21..a83bf2932f19 100644
--- a/pkgs/by-name/bo/bonzomatic/package.nix
+++ b/pkgs/by-name/bo/bonzomatic/package.nix
@@ -7,12 +7,12 @@
   alsa-lib,
   fontconfig,
   mesa_glu,
-  libXcursor,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxinerama,
+  libxrandr,
   xinput,
-  libXi,
-  libXext,
+  libxi,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,12 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     mesa_glu
-    libXcursor
-    libXinerama
-    libXrandr
+    libxcursor
+    libxinerama
+    libxrandr
     xinput
-    libXi
-    libXext
+    libxi
+    libxext
   ];
 
   postFixup = ''
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index fcba7c83a213..e1665d6d1ef6 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   wxGTK32,
-  libX11,
+  libx11,
   readline,
   fetchpatch,
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ bin2c ];
   buildInputs = [
     wxGTK32
-    libX11
+    libx11
     readline
   ];
 
diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix
index 8b3057b0288b..881f29239669 100644
--- a/pkgs/by-name/bo/box2d/package.nix
+++ b/pkgs/by-name/bo/box2d/package.nix
@@ -13,11 +13,11 @@
   glfw3,
   imgui,
   libGLU,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
   libglut,
   xorgproto,
 
@@ -72,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
       IMGUI_BUILD_GLFW_BINDING = true;
     })
     libGLU
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
     libglut
     xorgproto
   ];
diff --git a/pkgs/by-name/bo/box2d_2/package.nix b/pkgs/by-name/bo/box2d_2/package.nix
index 48eb6c42bfc9..59b0d1d50408 100644
--- a/pkgs/by-name/bo/box2d_2/package.nix
+++ b/pkgs/by-name/bo/box2d_2/package.nix
@@ -10,11 +10,11 @@
   # buildInputs
   glfw3,
   libGLU,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
   libglut,
   xorgproto,
 
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glfw3
     libGLU
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
     libglut
     xorgproto
   ];
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 3d61baca34d6..7104061ddd32 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -21,17 +21,17 @@
   gtk3,
   gtk4,
   qt6,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libkrb5,
   libuuid,
@@ -110,20 +110,20 @@ let
     gtk3
     gtk4
     libdrm
-    libX11
+    libx11
     libGL
     libxkbcommon
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
     libxshmfence
-    libXtst
+    libxtst
     libuuid
     libgbm
     nspr
diff --git a/pkgs/by-name/br/bristol/package.nix b/pkgs/by-name/br/bristol/package.nix
index dab1639125e7..c805e8465906 100644
--- a/pkgs/by-name/br/bristol/package.nix
+++ b/pkgs/by-name/br/bristol/package.nix
@@ -5,8 +5,8 @@
   alsa-lib,
   libjack2,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   libpulseaudio,
   copyDesktopItems,
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     libpulseaudio
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix
index 180578191552..9b4212bd8d0b 100644
--- a/pkgs/by-name/br/brlcad/package.nix
+++ b/pkgs/by-name/br/brlcad/package.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   cmake,
   fontconfig,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   freetype,
   libgbm,
 }:
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXi
+    libx11
+    libxi
     freetype
     libgbm
   ];
diff --git a/pkgs/by-name/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix
index aaae1dcc53ca..4cf6abd63618 100644
--- a/pkgs/by-name/bs/bschaffl/package.nix
+++ b/pkgs/by-name/bs/bschaffl/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   lv2,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
index 6e18d86fe0c8..f6decae52c64 100644
--- a/pkgs/by-name/bs/bsnes-hd/package.nix
+++ b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   gtk3,
   gtksourceview3,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libicns,
   libpulseaudio,
@@ -59,8 +59,8 @@ stdenv.mkDerivation {
     libao
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXv
+    libx11
+    libxv
     udev
     gtk3
     gtksourceview3
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index c5e621f5eba4..047de693024f 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  libXinerama,
+  libxinerama,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXinerama
+    libxinerama
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/bu/bucklespring-libinput/package.nix b/pkgs/by-name/bu/bucklespring-libinput/package.nix
index 8a7f15686481..71fb6aa0df6c 100644
--- a/pkgs/by-name/bu/bucklespring-libinput/package.nix
+++ b/pkgs/by-name/bu/bucklespring-libinput/package.nix
@@ -11,8 +11,8 @@
 
   openal,
   alure,
-  libXtst,
-  libX11,
+  libxtst,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     alure
   ]
   ++ lib.optionals legacy [
-    libXtst
-    libX11
+    libxtst
+    libx11
   ]
   ++ lib.optionals (!legacy) [ libinput ];
 
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index 26b401397b93..c1bbb4ae962b 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -26,7 +26,7 @@
   makeWrapper,
   glib,
   libbsd,
-  libX11,
+  libx11,
   xorg-server,
   kmod,
   xf86-video-nouveau,
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
   # Build-time dependencies of bumblebeed and optirun.
   # Note that it has several runtime dependencies.
   buildInputs = [
-    libX11
+    libx11
     glib
     libbsd
     kmod
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index 0c9ab5816356..b516143dd652 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -12,19 +12,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "bumpp";
-  version = "10.3.2";
+  version = "10.4.1";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "bumpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1hGVLPogdeyWh/B2Yxfo/9YbJpFYl8ATh+QCa2VVyyk=";
+    hash = "sha256-cYtk7gE2TYgrFUoa2HV56/qTSX/Dojlo+eDwWRGQr1c=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-y7uHDtoOjsLnNF47r4aWHYXW0ui8shhn1M0cD2FpaCg=";
+    hash = "sha256-/Yz5Gas3OsqdLAiuZRwGTTcIS/UR1WWms01vU1WxlCo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix
index 4ddc6309cdd7..8951b52cbd57 100644
--- a/pkgs/by-name/c6/c64-debugger/package.nix
+++ b/pkgs/by-name/c6/c64-debugger/package.nix
@@ -6,7 +6,7 @@
   gtk3,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   pkg-config,
   upx,
   libxcb-util,
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     gtk3
     libGL
     libGLU
-    libX11
+    libx11
     libxcb-util
   ];
 
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index a979212e10cf..7b045f2a5408 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open source implementation of the actor model in C++";
-    homepage = "http://actor-framework.org/";
+    homepage = "https://www.actor-framework.org/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     changelog = "https://github.com/actor-framework/actor-framework/raw/${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix
index 8f8e06024e1a..7326ee2dc221 100644
--- a/pkgs/by-name/ca/cage/package.nix
+++ b/pkgs/by-name/ca/cage/package.nix
@@ -16,7 +16,7 @@
   libxkbcommon,
   libxcb-wm,
   libGL,
-  libX11,
+  libx11,
   xwayland ? null,
   nixosTests,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-wm
     libGL
-    libX11
+    libx11
   ];
 
   postFixup = lib.optionalString wlroots_0_19.enableXWayland ''
diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index 73120b1031aa..163a15c9bfca 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -15,8 +15,8 @@
   pixman,
   zlib,
   x11Support ? !stdenv.hostPlatform.isDarwin || true,
-  libXext,
-  libXrender,
+  libxext,
+  libxrender,
   gobjectSupport ? true,
   glib,
   xcbSupport ? x11Support,
@@ -72,8 +72,8 @@ stdenv.mkDerivation (
       zlib
     ]
     ++ optionals x11Support [
-      libXext
-      libXrender
+      libxext
+      libxrender
     ]
     ++ optionals xcbSupport [ libxcb ]
     ++ optional gobjectSupport glib; # TODO: maybe liblzo but what would it be for here?
diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix
index 086ecb44a54f..7ac3155a6047 100644
--- a/pkgs/by-name/ca/cardinal/package.nix
+++ b/pkgs/by-name/ca/cardinal/package.nix
@@ -9,10 +9,10 @@
   jansson,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
   libarchive,
   libjack2,
   liblo,
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     jansson
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxrandr
     libarchive
     liblo
     libsamplerate
diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix
index 3bdd2335ae0a..73d6edec687b 100644
--- a/pkgs/by-name/ca/caribou/package.nix
+++ b/pkgs/by-name/ca/caribou/package.nix
@@ -12,7 +12,7 @@
   python3,
   libxml2,
   libxklavier,
-  libXtst,
+  libxtst,
   gtk2,
   intltool,
   libxslt,
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     dbus
     pythonEnv
     python3.pkgs.pygobject3
-    libXtst
+    libxtst
     gtk2
   ];
 
diff --git a/pkgs/by-name/cd/cdesktopenv/package.nix b/pkgs/by-name/cd/cdesktopenv/package.nix
index 5cda8d923622..9523f084119d 100644
--- a/pkgs/by-name/cd/cdesktopenv/package.nix
+++ b/pkgs/by-name/cd/cdesktopenv/package.nix
@@ -2,26 +2,26 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   bison,
   mksh,
   perl,
-  libXinerama,
-  libXt,
-  libXext,
+  libxinerama,
+  libxt,
+  libxext,
   libtirpc,
   motif,
-  libXft,
+  libxft,
   xbitmaps,
   libjpeg,
-  libXmu,
-  libXdmcp,
-  libXScrnSaver,
+  libxmu,
+  libxdmcp,
+  libxscrnsaver,
   bdftopcf,
   ncompress,
   mkfontdir,
   tcl,
-  libXaw,
+  libxaw,
   libxcrypt,
   glibcLocales,
   autoPatchelfHook,
@@ -31,7 +31,7 @@
   autoreconfHook,
   opensp,
   flex,
-  libXpm,
+  libxpm,
   rpcsvc-proto,
   sessreg,
   pkg-config,
@@ -71,23 +71,23 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libX11
-    libXinerama
-    libXt
-    libXext
+    libx11
+    libxinerama
+    libxt
+    libxext
     libtirpc
     motif
-    libXft
+    libxft
     xbitmaps
     libjpeg
-    libXmu
-    libXdmcp
-    libXScrnSaver
+    libxmu
+    libxdmcp
+    libxscrnsaver
     tcl
-    libXaw
+    libxaw
     mksh
     libxcrypt
-    libXpm
+    libxpm
     sessreg
     lmdb
   ];
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 52b100884300..912859780604 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -15,7 +15,7 @@
   gtk3,
   hidapi,
   imgui,
-  libXrender,
+  libxrender,
   libpng,
   libusb1,
   libzip,
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libusb1
     libzip
-    libXrender
+    libxrender
     pugixml
     rapidjson
     vulkan-headers
diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix
index 7153d395105a..3301875adc2f 100644
--- a/pkgs/by-name/ce/cen64/package.nix
+++ b/pkgs/by-name/ce/cen64/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libGL,
   libiconv,
-  libX11,
+  libx11,
   openal,
   nix-update-script,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libiconv
-    libX11
+    libx11
     openal
   ];
 
diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 7ce53102cd21..322ea5e73ac9 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -3,7 +3,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   # clipboard functionality not working on Darwin
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   vendorHash = null;
 
diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix
index cc34ba0610a2..2d0746137cbc 100644
--- a/pkgs/by-name/cg/cgui/package.nix
+++ b/pkgs/by-name/cg/cgui/package.nix
@@ -5,7 +5,7 @@
   texinfo,
   allegro,
   perl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     texinfo
     allegro
     perl
-    libX11
+    libx11
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix
index 91530a78206e..49cfead9e5a5 100644
--- a/pkgs/by-name/ch/chemtool/package.nix
+++ b/pkgs/by-name/ch/chemtool/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   gtk2,
   fig2dev,
   wrapGAppsHook3,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
   buildInputs = [
-    libX11
+    libx11
     gtk2
     fig2dev
   ];
diff --git a/pkgs/by-name/ch/chessdb/package.nix b/pkgs/by-name/ch/chessdb/package.nix
index 4c117dc62236..f17d43c4204d 100644
--- a/pkgs/by-name/ch/chessdb/package.nix
+++ b/pkgs/by-name/ch/chessdb/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   tcl,
   tk,
-  libX11,
+  libx11,
   makeWrapper,
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     tcl
     tk
-    libX11
+    libx11
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ch/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix
index 752dde048323..aa38643ee4f4 100644
--- a/pkgs/by-name/ch/chez-racket/shared.nix
+++ b/pkgs/by-name/ch/chez-racket/shared.nix
@@ -8,7 +8,7 @@ args:
   darwin,
   ncurses,
   libiconv,
-  libX11,
+  libx11,
   zlib,
   lz4,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (
     ];
     buildInputs = [
       libiconv
-      libX11
+      libx11
       lz4
       ncurses
       zlib
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index c09310a7a1ab..4b636c759f5e 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -10,7 +10,7 @@
   darwin,
   ncurses,
   libiconv,
-  libX11,
+  libx11,
   testers,
   writableTmpDirAsHomeHook,
   buildPackages,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
   ]
   ++ lib.optionals stdenv.hostPlatform.isUnix [
-    libX11
+    libx11
   ];
 
   /*
diff --git a/pkgs/by-name/ch/chipmunk/package.nix b/pkgs/by-name/ch/chipmunk/package.nix
index 30f004669f1a..07b6c31b2040 100644
--- a/pkgs/by-name/ch/chipmunk/package.nix
+++ b/pkgs/by-name/ch/chipmunk/package.nix
@@ -8,12 +8,12 @@
   libGL,
   glfw2,
   glew,
-  libX11,
+  libx11,
   xorgproto,
-  libXi,
-  libXmu,
+  libxi,
+  libxmu,
   fetchpatch,
-  libXrandr,
+  libxrandr,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     libGL
     glfw2
     glew
-    libX11
+    libx11
     xorgproto
-    libXi
-    libXmu
-    libXrandr
+    libxi
+    libxmu
+    libxrandr
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix
index 16ad7447de1d..33bf51c5b814 100644
--- a/pkgs/by-name/ch/chiptrack/package.nix
+++ b/pkgs/by-name/ch/chiptrack/package.nix
@@ -18,11 +18,11 @@
   libglvnd,
   libjpeg,
   libxkbcommon,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   makeWrapper,
   ninja,
   pkg-config,
@@ -114,11 +114,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
           ++ lib.optionals clangStdenv.hostPlatform.isLinux [
             libglvnd
             libxkbcommon
-            libX11
-            libXcursor
-            libXext
-            libXrandr
-            libXi
+            libx11
+            libxcursor
+            libxext
+            libxrandr
+            libxi
             wayland
           ]
         )
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 9e5aa61cbda2..fdba91e2e5af 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index fb4716d53c96..729e7f93c03e 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -7,10 +7,10 @@
   freetype,
   lib,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   libxkbcommon,
   lv2,
@@ -40,10 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     freetype
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
     libxkbcommon
     lv2
diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix
index d71c4124ad14..fac85cd36a82 100644
--- a/pkgs/by-name/ch/chow-phaser/package.nix
+++ b/pkgs/by-name/ch/chow-phaser/package.nix
@@ -12,12 +12,12 @@
   gtk3,
   lib,
   libGL,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libdatrie,
   libjack2,
   libpsl,
@@ -60,12 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     gtk3
     libGL
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     libdatrie
     libjack2
     libpsl
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index e61a13ab1618..c7524b7588dc 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -11,12 +11,12 @@
   gtk3,
   lib,
   libGL,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libdatrie,
   libjack2,
   libpsl,
@@ -66,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     gtk3
     libGL
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     libdatrie
     libjack2
     libpsl
diff --git a/pkgs/by-name/ci/cinelerra/package.nix b/pkgs/by-name/ci/cinelerra/package.nix
index d890f199cc07..89efbd0a8de3 100644
--- a/pkgs/by-name/ci/cinelerra/package.nix
+++ b/pkgs/by-name/ci/cinelerra/package.nix
@@ -25,12 +25,12 @@
   x264,
   gettext,
   openexr,
-  libXext,
-  libXxf86vm,
-  libXv,
-  libXi,
-  libX11,
-  libXft,
+  libxext,
+  libxxf86vm,
+  libxv,
+  libxi,
+  libx11,
+  libxft,
   xorgproto,
   libtheora,
   libpng,
@@ -96,12 +96,12 @@ stdenv.mkDerivation {
     x264
     gettext
     openexr
-    libXext
-    libXxf86vm
-    libXv
-    libXi
-    libX11
-    libXft
+    libxext
+    libxxf86vm
+    libxv
+    libxi
+    libx11
+    libxft
     xorgproto
     libtheora
     libpng
diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
index fc64851c586c..6bb69dd84c82 100644
--- a/pkgs/by-name/ci/cinnamon-control-center/package.nix
+++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix
@@ -18,7 +18,7 @@
   libwacom,
   wrapGAppsHook3,
   libnma,
-  libXi,
+  libxi,
   modemmanager,
   xorgproto,
   meson,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwacom
     networkmanager
     libnma
-    libXi
+    libxi
     modemmanager
     xorgproto
     upower
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index d2ba38f50427..9c4fe470673a 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -22,8 +22,8 @@
   json-glib,
   libsecret,
   libstartup_notification,
-  libXtst,
-  libXdamage,
+  libxtst,
+  libxdamage,
   libgbm,
   muffin,
   networkmanager,
@@ -107,8 +107,8 @@ stdenv.mkDerivation rec {
     json-glib
     libsecret
     libstartup_notification
-    libXtst
-    libXdamage
+    libxtst
+    libxdamage
     libgbm
     muffin
     networkmanager
diff --git a/pkgs/by-name/ck/ckb-next/package.nix b/pkgs/by-name/ck/ckb-next/package.nix
index 70f4db66cb5d..8825a524ee64 100644
--- a/pkgs/by-name/ck/ckb-next/package.nix
+++ b/pkgs/by-name/ck/ckb-next/package.nix
@@ -10,7 +10,7 @@
   cmake,
   zlib,
   kmod,
-  libXdmcp,
+  libxdmcp,
   gnused,
   withPulseaudio ? stdenv.hostPlatform.isLinux,
   libpulseaudio,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     udev
     qt6.qtbase
     zlib
-    libXdmcp
+    libxdmcp
     qt6.qttools
     qt6Packages.quazip
     qt6.qtwayland
diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix
index 5ecd5b46fec5..b9a6450a7c5c 100644
--- a/pkgs/by-name/cl/clanlib/package.nix
+++ b/pkgs/by-name/cl/clanlib/package.nix
@@ -10,8 +10,8 @@
   freetype,
   fontconfig,
   alsa-lib,
-  libXrender,
-  libXinerama,
+  libxrender,
+  libxinerama,
   nix-update-script,
 }:
 
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fontconfig
     alsa-lib
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix
index fb788a2845f1..4076d261d389 100644
--- a/pkgs/by-name/cl/classicube/package.nix
+++ b/pkgs/by-name/cl/classicube/package.nix
@@ -6,8 +6,8 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libGL,
   curl,
   openal,
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    libX11
-    libXi
+    libx11
+    libxi
     libGL
     curl
     openal
diff --git a/pkgs/by-name/cl/clightd/package.nix b/pkgs/by-name/cl/clightd/package.nix
index 33fa4c4fd91f..c5f7223b9a32 100644
--- a/pkgs/by-name/cl/clightd/package.nix
+++ b/pkgs/by-name/cl/clightd/package.nix
@@ -12,16 +12,16 @@
   libusb1,
   libjpeg,
   libmodule,
-  libXdmcp,
+  libxdmcp,
   util-linux,
   libpthread-stubs,
   enableDdc ? true,
   ddcutil,
   enableDpms ? true,
-  libXext,
+  libxext,
   enableGamma ? true,
   libdrm,
-  libXrandr,
+  libxrandr,
   libiio,
   wayland,
   enableScreen ? true,
@@ -81,13 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
     libmodule
     libiio
 
-    libXdmcp
+    libxdmcp
     util-linux
     libpthread-stubs
   ]
   ++ lib.optionals enableDdc [ ddcutil ]
-  ++ lib.optionals enableDpms [ libXext ]
-  ++ lib.optionals enableGamma [ libXrandr ]
+  ++ lib.optionals enableDpms [ libxext ]
+  ++ lib.optionals enableGamma [ libxrandr ]
   ++ lib.optionals (enableDpms || enableGamma || enableScreen) [
     libdrm
     wayland
diff --git a/pkgs/by-name/cl/clipnotify/package.nix b/pkgs/by-name/cl/clipnotify/package.nix
index 992bb1398b78..33f9bfbc8943 100644
--- a/pkgs/by-name/cl/clipnotify/package.nix
+++ b/pkgs/by-name/cl/clipnotify/package.nix
@@ -1,6 +1,6 @@
 {
-  libX11,
-  libXfixes,
+  libx11,
+  libxfixes,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXfixes
+    libx11
+    libxfixes
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index 27f403c97843..e5b731968d59 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitLab,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   makeDesktopItem,
   libgbm,
   pkg-config,
@@ -37,13 +37,13 @@ buildGoModule rec {
 
   buildInputs = [
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
     libgbm
   ];
 
diff --git a/pkgs/by-name/cl/clonehero/package.nix b/pkgs/by-name/cl/clonehero/package.nix
index c1362d517a44..8133d140a201 100644
--- a/pkgs/by-name/cl/clonehero/package.nix
+++ b/pkgs/by-name/cl/clonehero/package.nix
@@ -8,14 +8,14 @@
   alsa-lib,
   dbus,
   libGL,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   udev,
   vulkan-loader, # (not used by default, enable in settings menu)
   wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
@@ -48,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
     # Run-time libraries (loaded with dlopen)
     dbus
     libGL
-    libXcursor
-    libXext
-    libXi
-    libXinerama
+    libxcursor
+    libxext
+    libxi
+    libxinerama
     libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     udev
     vulkan-loader
     wayland
diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix
index a26e55212153..a95c112f3c95 100644
--- a/pkgs/by-name/cl/cloudflare-cli/package.nix
+++ b/pkgs/by-name/cl/cloudflare-cli/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cloudflare-cli";
-  version = "5.1.0";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "danielpigott";
     repo = "cloudflare-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FE6LvzGd3Pl31vocXSZ6VY6P3iuVPxQR1eJwUSkXf70=";
+    hash = "sha256-KDL9UGsBVH+BxeMwpcwqH0P0Y8QbFMSqNT5FrTZxDog=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-dH0eW2IIxgqLiJHAmDKbeA0xz2EMWrZrKIf3P2mBDKU=";
+    hash = "sha256-30zvP1sYENfTh8o/RiSrYPZR3to3GF2m036q/+mrcSU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/clutter/package.nix b/pkgs/by-name/cl/clutter/package.nix
index 9b224902df09..1c2c1ed2876f 100644
--- a/pkgs/by-name/cl/clutter/package.nix
+++ b/pkgs/by-name/cl/clutter/package.nix
@@ -5,12 +5,12 @@
   pkg-config,
   libGLU,
   libGL,
-  libX11,
-  libXext,
-  libXfixes,
-  libXdamage,
-  libXcomposite,
-  libXi,
+  libx11,
+  libxext,
+  libxfixes,
+  libxdamage,
+  libxcomposite,
+  libxi,
   libxcb,
   cogl,
   pango,
@@ -54,14 +54,14 @@ stdenv.mkDerivation {
     gobject-introspection
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
     libGL
     libGLU
-    libXext
-    libXfixes
-    libXdamage
-    libXcomposite
-    libXi
+    libxext
+    libxfixes
+    libxdamage
+    libxcomposite
+    libxi
     libxcb
     libinput
     libgudev
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index beec964eecb5..8fd16c4d4281 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -6,7 +6,7 @@
   cmake,
   libGL,
   libGLU,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libX11;
+  ++ lib.optional stdenv.hostPlatform.isLinux libx11;
 
   meta = {
     homepage = "https://github.com/coin3d/coin";
diff --git a/pkgs/by-name/co/construo/package.nix b/pkgs/by-name/co/construo/package.nix
index 85eb218ce3bc..5751e2054c8d 100644
--- a/pkgs/by-name/co/construo/package.nix
+++ b/pkgs/by-name/co/construo/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   zlib,
   xorgproto,
   withLibGL ? !stdenv.hostPlatform.isDarwin,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
     zlib
     xorgproto
   ]
diff --git a/pkgs/by-name/co/copyq/package.nix b/pkgs/by-name/co/copyq/package.nix
index b1b3e65f8d63..7b486ec05bc9 100644
--- a/pkgs/by-name/co/copyq/package.nix
+++ b/pkgs/by-name/co/copyq/package.nix
@@ -6,8 +6,8 @@
   cmake,
   ninja,
   qt6,
-  libXfixes,
-  libXtst,
+  libxfixes,
+  libxtst,
   wayland,
   pkg-config,
   kdePackages,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     qt6.qtsvg
     qt6.qttools
     qt6.qtdeclarative
-    libXfixes
-    libXtst
+    libxfixes
+    libxtst
     qt6.qtwayland
     wayland
     kdePackages.kconfig
diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index daed0e15bf7b..a242457cc4dd 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-+1cqennGetcjJTgVfglq/LJ22goLQmahPCK/atdHxXU=";
+    hash = "sha256-AauNHedDr6WcnbuQLWdcecyeqJJ2npyxVS+5BuBUDIE=";
   };
 
-  cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
+  cargoHash = "sha256-n83JK/pOEMLTBlh0bbFqyW10usEthrSiXoozqmkUa58=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 70d38b0b2521..b02d6980d4f4 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-3vIp+Vs4prsFFiTmjrUXoYqH27y6ccVlUQcP5ICFq3g=";
+    hash = "sha256-emJc7pp+VF+YwEQ7+VI6gP8z20eWcrvubBDEqATyRfk=";
   };
 
-  cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
+  cargoHash = "sha256-apLIpb1VUuQRgOJ2mQioPyucbETzyh5wOeatMCLGrc4=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 7ea99d5f72c6..966ffb4aea32 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-LBIcQG3ZebK1bPVJ8WNHkHMLPsEcw77oZAkQRrd4j6o=";
+    hash = "sha256-lD5lTYXBy+keee+VArtNHgCS9n737YKaW8Kg3tu+8o0=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 803a2190b24c..b4dc8766d14c 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vhWZpn9FPoH+mTKqCf6ug73FdT7Odr6f8pWNNIDKwFs=";
+    hash = "sha256-ccLifEvy705JpmXFrkouVW6yFNh2bafxy366H7pzmlQ=";
   };
 
   cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 1c4bddab9839..a870bc9c89c2 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-4+GfIAsjzo1jr+wa9JjuIUvW3P3r03avP2W5hZJYXHU=";
+    hash = "sha256-ico9i7NqNtmvz+mptuOc/d34WBxsJ4HI5A/daX/we/A=";
   };
 
-  cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";
+  cargoHash = "sha256-c7TEjrGCop1KL6gGjXSXg0lmZi7xgpqxrjorrlnKwb4=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index c664e9d3bf68..2b0a1b29fd2f 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-aHNu6IedGWag6u+uRg2IFfcb8fTu5o4XfGwBXJBOkSM=";
+    hash = "sha256-Q8/DM24/6sjn9+nDE16GD3QJHfb0QgfVK7fXuLrb8Gs=";
   };
 
-  cargoHash = "sha256-kzyyKzkuCYqEsaaKhAVH31ztbww4k8XZ5HyBQeYO/Nc=";
+  cargoHash = "sha256-3fnZizzYGjsAGHoONKgMB34uoxZPa5Pdvl4/biapjnU=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 4555a5653838..384be08c6f4a 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,17 +19,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ivFs/AOUXhzd6I9H+Zw3CS97qFQ/FeiAnlDuzRMneQI=";
+    hash = "sha256-DVSt66vgcp/cn3gSNROY/0J1qdKpcqlSE+iylApMycY=";
   };
 
-  cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
+  cargoHash = "sha256-sNJTXBInr/h8w5dhOOP9ceBYWBcJW3qGjDuaG6UTV90=";
 
   env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index ba9837db6a9f..9bee16ee278e 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index aa03f36bf220..a08a29d6a49e 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-idle";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-qVrcMI7sr0mWyYW1fM6oP/6qKEhlqqyQ/WiJaWfCQPU=";
+    hash = "sha256-mQnWGYHlY1zKGynCwJSxjMSeHd0iBFYWsY3b1wZEGTs=";
   };
 
-  cargoHash = "sha256-vfuhXT/MJHchJdW+3GPuvZbYVdClpsbNfOzLKWW4LPY=";
+  cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 58bc324f4fcf..7c394e1d9d04 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xeJfS3vXYCy3R20K5jiyPmgZI+arhkzm3Vz6YQnLe9Y=";
+    hash = "sha256-y2wRVAnCh1B45MZLj0e1waAJlsp/cUUcshuHItyCQgs=";
   };
 
-  cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
+  cargoHash = "sha256-Kj+eaTMHMQQHN0X3prIuZm1wvfnaV7BUlUKem6JLtc8=";
 
   buildFeatures = [ "nixos" ];
 
diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index be43c37bbb9e..40dd1eb2fe52 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-uKTeNTJtsDx0FS3fmvqMbXPTezMkD1dcn5dPKXvmcp4=";
+    hash = "sha256-jpiIebeMZwx6OHpmQlG0PptOv08opretAJjYEQV9j84=";
   };
 
-  cargoHash = "sha256-bmQ8Ni0sR9gfttsEhh9LNbWmTdOkW/JSMEzOf+kvN98=";
+  cargoHash = "sha256-o2CyAjUp0E4m5G4SG8vm4RhQzvFsmbgfJDQRRxoyGEg=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 55b51602ca0b..5a5a682ce386 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BNOerRv9w0Y9Wozoc5IOouMjne7XQN/SItSy2LQrK9w=";
+    hash = "sha256-vTg3poU2MfkpcBCFTBzBsZ2rQetAgQz8E6269O6aYrk=";
   };
 
   cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";
diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 0a9ea87c0d13..96ea51febf0b 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6GuLFy1DKXk//LhhRA62KX1P/X+QSsNCy5Eiwjxqk9M=";
+    hash = "sha256-O3HGAz0Sk3LI/5J68/CVYserSFZztLxbMYp5fkLqgfY=";
   };
 
   cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";
diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index bd102f53d0c2..5ab5f744448b 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 3fb9f91e3335..4e6c12641143 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-F5Phk9JgcSc3Hj+2NxVfqq1Ujz8hv3DVJqAP3aEo2Ic=";
+    hash = "sha256-jFaeBJQjLRrQuFskRWVgmO0FqYX6mXrZBnUHF3KfVrc=";
   };
 
-  cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8=";
+  cargoHash = "sha256-8uyYs1J2284AHy8xEG9uYtSMFcm93LmtCp491zC6fLA=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 41f273aa7e25..317421f19875 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix
index db0db0399f60..9b3124d2c2c7 100644
--- a/pkgs/by-name/co/cosmic-reader/package.nix
+++ b/pkgs/by-name/co/cosmic-reader/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-reader";
-  version = "0-unstable-2026-01-16";
+  version = "0-unstable-2026-01-31";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-reader";
-    rev = "1b030e2f96dc7a141473f87de3cb1f375298589f";
-    hash = "sha256-r+QPe7+rvdYm76DLFtOePh9+eIvSbzuqvhe4490ynWk=";
+    rev = "4dec38f058da6f4443ea3a2032be79339d7c814e";
+    hash = "sha256-LyBzcWJWOSe5TNS9trH7To2Te1aFPSsUGV9c/nfK0oA=";
   };
 
-  cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
+  cargoHash = "sha256-IT0gCE1chtmvu/sSjkQ3t1eIUq/ItfxygICe8HOBDHA=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index f2aee8b9df6b..ce87604987d6 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xNEICyR/4EYTPTMnlRTag3Ji5rM8HJl6m9MAe7FdHTk=";
+    hash = "sha256-f2KdtZBPSM7Ol0umCWXkkn54DnnvqGm8kuilp4HJ8OU=";
   };
 
   cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 64ac86039f23..54158a6b7435 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-JlRGK3uac94r81MBaOZZ4hRcKD4fh/vgJBxic0BSWnY=";
+    hash = "sha256-LZN+7hN3rBpVk7UWvG9D4gH2UOrfwMmSisdIsOT4vmA=";
   };
 
   cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 81306035d0be..c93f2fbe0fdf 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-4BXsjcAzu4twwIGqHQ4jvewO5oUns6yqY1n26KbIygQ=";
+    hash = "sha256-4YozCuj6lF9GmsV9eRD4HEb3G8tYKjQc3+ghYHxKrhE=";
   };
 
   postPatch = ''
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
   '';
 
-  cargoHash = "sha256-1YQ7eQ6L6OHvVihUUnZCDWXXtVOyaI1pFN7YD/OBcfo=";
+  cargoHash = "sha256-KRV9WKOf9W0g4d2uKrAFEuDqJgr+CTpvtVLn7TIYuBw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 413b376c967a..7770177c6a28 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-/Zzs2b51J0v9PavMr3MuNiFBprb7oJiSC+qDVvMTwEk=";
+    hash = "sha256-OIVG0snnYtRkL8D3nurlygkqx6ugzIV4RPm7wReaE4o=";
   };
 
-  cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
+  cargoHash = "sha256-T9fbhrYrQrc7TjyumhfT5vyElRKnDzxVBsJtcGA3f7I=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 34d1096550d3..426e4ccf66e5 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-61O6TY41raQ1+EhCLrCC8Krzt6pWM/BFL61KHkxou2M=";
+    hash = "sha256-5PXOg0HE2Q/mP8QzYP1iA4/Qg8h6+gUAvPtHixS3xzA=";
   };
 
-  cargoHash = "sha256-VapIpvjtBo+oSUWtilPR0v5crjDVt0OGdHlx73Gb6Jk=";
+  cargoHash = "sha256-CF8gbrWaAlBJ+siqN1eTiqpLLxcLWZ0NsXWlRT9O5HU=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 690176cf44e8..a229b6519519 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-RYRAJhixba8i8hKpZSZLPLza+V9XZuSaZmWknoIJ3mk=";
+    hash = "sha256-0YTiLCRw2aObPM2KUbx25q9vuAXejFKFTVtVOu6nHdw=";
   };
 
-  cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";
+  cargoHash = "sha256-qdM4Wh4td1fGunjH4qkGaXBuu1HO+I6KVR7zImU/WaE=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 37ca95969c68..cdc7f97806be 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index c3b7a8059819..3877f23886a6 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-workspaces-epoch";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Gg4ogMf2C3rXf3p/8GPpiZ2aG02KWTtrqby47UW7B3I=";
+    hash = "sha256-MWQhDFCn10ONm3SuT+vcXkliCvm3xPJHHYVytufCq2g=";
   };
 
   cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4=";
diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix
index 0817e99d435e..dc2f55303da9 100644
--- a/pkgs/by-name/cp/cpu-x/package.nix
+++ b/pkgs/by-name/cp/cpu-x/package.nix
@@ -17,7 +17,7 @@
   vulkan-headers,
   vulkan-loader,
   glfw,
-  libXdmcp,
+  libxdmcp,
   pcre,
   util-linux,
   libselinux,
@@ -28,7 +28,7 @@
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   gtkmm3,
 }:
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     glfw
     opencl-headers
     ocl-icd
-    libXdmcp
+    libxdmcp
     pcre
     util-linux
     libselinux
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
   ];
 
   preFixup = ''
diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index a9efef2055cf..5e94f15a5447 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -13,7 +13,7 @@
   libpng,
   pngpp,
   libwebp,
-  libX11,
+  libx11,
 }:
 
 let
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     libwebp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
   strictDeps = true;
 
diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix
index 7099451fdaab..630daf364b6f 100644
--- a/pkgs/by-name/ct/ctagdrc/package.nix
+++ b/pkgs/by-name/ct/ctagdrc/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     freetype
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index 796e4587faf3..45865b47e42b 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -8,7 +8,7 @@
   hamlib,
   libpulseaudio,
   libGL,
-  libX11,
+  libx11,
   liquid-dsp,
   pkg-config,
   soapysdr-with-plugins,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     libGL
-    libX11
+    libx11
   ];
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index e2dc85ce035a..588fe324b6fa 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
-  libXrandr,
-  libXft,
+  libx11,
+  libxinerama,
+  libxrandr,
+  libxft,
   bison,
   pkg-config,
 }:
@@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
     bison
   ];
   buildInputs = [
-    libX11
-    libXinerama
-    libXrandr
-    libXft
+    libx11
+    libxinerama
+    libxrandr
+    libxft
   ];
 
   prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix
index 4e15a46526e2..565f9c9b3703 100644
--- a/pkgs/by-name/da/daggerfall-unity/package.nix
+++ b/pkgs/by-name/da/daggerfall-unity/package.nix
@@ -6,12 +6,12 @@
   fetchzip,
   lib,
   libGL,
-  libXScrnSaver,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libxscrnsaver,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   libpulseaudio,
   libudev0-shim,
   makeDesktopItem,
@@ -56,12 +56,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     alsa-lib
     libGL
-    libXScrnSaver
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libxscrnsaver
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
     libpulseaudio
     libudev0-shim
     vulkan-loader
diff --git a/pkgs/by-name/da/darcnes/package.nix b/pkgs/by-name/da/darcnes/package.nix
index 7a68ff5bf713..4a0dd84c52c6 100644
--- a/pkgs/by-name/da/darcnes/package.nix
+++ b/pkgs/by-name/da/darcnes/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
-  libXext,
-  libXaw,
+  libx11,
+  libxt,
+  libxext,
+  libxaw,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   patches = [ ./label.patch ];
 
   buildInputs = [
-    libX11
-    libXt
-    libXext
-    libXaw
+    libx11
+    libxt
+    libxext
+    libxaw
   ];
   installPhase = "install -Dt $out/bin darcnes";
 
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index b050e643c752..00ca5bd6ee82 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -16,7 +16,7 @@
   ftgl,
   freetype,
   glew,
-  libX11,
+  libx11,
   glib,
   python3,
   asciidoctor,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgit2
     python3
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index ce87ec77391a..a011c5748b29 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -67,10 +67,10 @@
   colord-gtk,
   libselinux,
   libsepol,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxkbcommon,
-  libXtst,
+  libxtst,
   ocl-icd,
   # Darwin only
   gtk-mac-integration,
@@ -155,10 +155,10 @@ stdenv.mkDerivation rec {
     colord-gtk
     libselinux
     libsepol
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxkbcommon
-    libXtst
+    libxtst
     ocl-icd
     util-linux
   ]
diff --git a/pkgs/by-name/da/darktile/package.nix b/pkgs/by-name/da/darktile/package.nix
index a26a97ea8ad1..4bdde9305925 100644
--- a/pkgs/by-name/da/darktile/package.nix
+++ b/pkgs/by-name/da/darktile/package.nix
@@ -2,13 +2,13 @@
   fetchFromGitHub,
   lib,
   pkg-config,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXinerama,
-  libXi,
-  libXext,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxinerama,
+  libxi,
+  libxext,
+  libxxf86vm,
   libGL,
   nixosTests,
   buildGoModule,
@@ -30,13 +30,13 @@ buildGoModule rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
-    libXext
-    libXxf86vm
+    libx11
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
+    libxext
+    libxxf86vm
     libGL
   ];
 
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 9bd5360a4927..19093e4d20fb 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.285.0";
+  version = "0.287.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hiRae4pb8WsWvQ4ucRhz6eY2+h6KIXjCkxNVOL2hUbA=";
+    hash = "sha256-gUy1fhv/l/wmFUTSHcORkVu/ggbFv0Dc5KTjbPlrKPU=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-PIHy5XJEx5FAWhm5i4dTGlPMf5Gnxz98xE4OeWVyvnE=";
+  vendorHash = "sha256-TNUI2VQVKnxTiKQg9Bj3qDK2w3oOjO0rdrtTlFIhTzA=";
 
   excludedPackages = [
     "bundle/internal"
diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index dde7d21c8e6e..c4deac4af9bb 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   ant,
   jdk,
-  libXtst,
+  libxtst,
   coreutils,
   gnugrep,
   zulu,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           glib
           gtk'
-          libXtst
+          libxtst
         ]
       }
 
diff --git a/pkgs/by-name/dd/ddd/package.nix b/pkgs/by-name/dd/ddd/package.nix
index e6a90e53b518..e870f0d26220 100644
--- a/pkgs/by-name/dd/ddd/package.nix
+++ b/pkgs/by-name/dd/ddd/package.nix
@@ -6,8 +6,8 @@
   desktopToDarwinBundle,
   motif,
   ncurses,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   gdb,
 }:
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     motif
     ncurses
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   # ioctl is not found without this flag. fixed in next release
diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index cd584368a7f8..97e29e8654ad 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libnotify,
   libogg,
-  libX11,
+  libx11,
   opusfile,
   pcre,
   python3,
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       spirv-tools
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
+      libx11
     ]
   );
 
diff --git a/pkgs/by-name/dd/ddrescueview/package.nix b/pkgs/by-name/dd/ddrescueview/package.nix
index 50828787fa1c..5048801adfa3 100644
--- a/pkgs/by-name/dd/ddrescueview/package.nix
+++ b/pkgs/by-name/dd/ddrescueview/package.nix
@@ -9,7 +9,7 @@
   gdk-pixbuf,
   glib,
   gtk2,
-  libX11,
+  libx11,
   pango,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     gtk2
-    libX11
+    libx11
     pango
   ];
 
diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index 6179b42afcad..df3a2bc559bf 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -40,7 +40,7 @@
   artworkSupport ? true,
   imlib2,
   hotkeysSupport ? true,
-  libX11,
+  libx11,
   osdSupport ? true,
   dbus,
   # output plugins
@@ -116,7 +116,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     imlib2
   ]
   ++ optionals hotkeysSupport [
-    libX11
+    libx11
   ]
   ++ optionals osdSupport [
     dbus
diff --git a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
index d50412deb49d..cbd620ec8f07 100644
--- a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
+++ b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   freetype,
-  libX11,
-  libXi,
-  libXt,
-  libXft,
+  libx11,
+  libxi,
+  libxt,
+  libxft,
 }:
 
 stdenv.mkDerivation {
@@ -30,10 +30,10 @@ stdenv.mkDerivation {
   CFLAGS = "-D_DARWIN_C_SOURCE";
   makeFlags = [ "DESTDIR=$(out)" ];
   buildInputs = [
-    libX11
-    libXi
-    libXt
-    libXft
+    libx11
+    libxi
+    libxt
+    libxft
   ];
   # build fails when run in parallel
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix
index 8c5b9d5e350d..49400c93d453 100644
--- a/pkgs/by-name/de/decent-sampler/package.nix
+++ b/pkgs/by-name/de/decent-sampler/package.nix
@@ -9,7 +9,7 @@
   alsa-lib,
   freetype,
   nghttp2,
-  libX11,
+  libx11,
   expat,
 }:
 
@@ -71,7 +71,7 @@ buildFHSEnv {
     decent-sampler
     freetype
     nghttp2
-    libX11
+    libx11
     expat
   ];
 
diff --git a/pkgs/by-name/de/delayarchitect/package.nix b/pkgs/by-name/de/delayarchitect/package.nix
index 53a3f3713085..0646e77ffd3a 100644
--- a/pkgs/by-name/de/delayarchitect/package.nix
+++ b/pkgs/by-name/de/delayarchitect/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   freetype,
   alsa-lib,
   cmake,
@@ -34,11 +34,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libGL
-    libX11
-    libXext
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxext
+    libxrandr
+    libxinerama
+    libxcursor
     freetype
     alsa-lib
   ];
diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index 98c8fbf1c1b7..e391c3410856 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -8,12 +8,12 @@
   gtest,
   libei,
   libportal,
-  libX11,
+  libx11,
   libxkbfile,
-  libXtst,
-  libXinerama,
-  libXi,
-  libXrandr,
+  libxtst,
+  libxinerama,
+  libxi,
+  libxrandr,
   libxkbcommon,
   pugixml,
   python3,
@@ -66,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     libei
     libportal
-    libX11
+    libx11
     libxkbfile
-    libXinerama
-    libXi
-    libXrandr
-    libXtst
+    libxinerama
+    libxi
+    libxrandr
+    libxtst
     libxkbcommon
     pugixml
     gdk-pixbuf
diff --git a/pkgs/by-name/de/desmume/package.nix b/pkgs/by-name/de/desmume/package.nix
index 94064d3b704c..cc6b654542e4 100644
--- a/pkgs/by-name/de/desmume/package.nix
+++ b/pkgs/by-name/de/desmume/package.nix
@@ -11,7 +11,7 @@
   gtk3,
   intltool,
   libGLU,
-  libXmu,
+  libxmu,
   libpcap,
   libtool,
   lua,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     gtk3
     libGLU
-    libXmu
+    libxmu
     libpcap
     openal
     soundtouch
diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix
index f49b88e4cea4..b24c736543d2 100644
--- a/pkgs/by-name/de/devour/package.nix
+++ b/pkgs/by-name/de/devour/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 -t $out/bin devour
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Hides your current window when launching an external program";
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 6a699e941963..4d645d779f1f 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -5,11 +5,11 @@
   gitUpdater,
   cmake,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
   libjack2,
@@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXcursor
-    libXinerama
-    libXrandr
+    libx11
+    libxext
+    libxcursor
+    libxinerama
+    libxrandr
     freetype
     alsa-lib
     libjack2
diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix
index 03e314492d1d..b9a364a25a73 100644
--- a/pkgs/by-name/dh/dhewm3/package.nix
+++ b/pkgs/by-name/dh/dhewm3/package.nix
@@ -10,7 +10,7 @@
   libjpeg,
   libogg,
   libvorbis,
-  libX11,
+  libx11,
   openal,
   curl,
   copyDesktopItems,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     libGLU
     libGL
-    libX11
+    libx11
     zlib
     libjpeg
     libogg
diff --git a/pkgs/by-name/di/dillo-plus/package.nix b/pkgs/by-name/di/dillo-plus/package.nix
index e6032ba38c95..f1caa7955ea2 100644
--- a/pkgs/by-name/di/dillo-plus/package.nix
+++ b/pkgs/by-name/di/dillo-plus/package.nix
@@ -6,7 +6,7 @@
   giflib,
   libjpeg,
   libpng,
-  libXdmcp,
+  libxdmcp,
   openssl,
   pkg-config,
   wget,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     giflib
     libjpeg
     libpng
-    libXdmcp
+    libxdmcp
     openssl
   ];
 
diff --git a/pkgs/by-name/di/diodon/package.nix b/pkgs/by-name/di/diodon/package.nix
index c65646b31a16..e487fd5d4f4b 100644
--- a/pkgs/by-name/di/diodon/package.nix
+++ b/pkgs/by-name/di/diodon/package.nix
@@ -14,7 +14,7 @@
   xvfb-run,
   libayatana-appindicator,
   libpeas,
-  libXtst,
+  libxtst,
   zeitgeist,
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libayatana-appindicator
     libpeas
-    libXtst
+    libxtst
     zeitgeist
   ];
 
diff --git a/pkgs/by-name/di/diopser/package.nix b/pkgs/by-name/di/diopser/package.nix
index 2c7bb8a5bfa1..e0c5342b1fdf 100644
--- a/pkgs/by-name/di/diopser/package.nix
+++ b/pkgs/by-name/di/diopser/package.nix
@@ -8,11 +8,11 @@
   libjack2,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
 }:
 
 let
@@ -84,11 +84,11 @@ stdenv.mkDerivation {
     libjack2
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/di/disk_indicator/package.nix b/pkgs/by-name/di/disk_indicator/package.nix
index 1f2e4d3b6f55..8de9b94a97f1 100644
--- a/pkgs/by-name/di/disk_indicator/package.nix
+++ b/pkgs/by-name/di/disk_indicator/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postPatch = ''
     # avoid -Werror
diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix
index 186d87c3d0a6..8b7123b29815 100644
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@@ -6,10 +6,10 @@
   fftwFloat,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrender,
   meson,
   ninja,
   pkg-config,
@@ -50,10 +50,10 @@ stdenv.mkDerivation {
     alsa-lib
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxrender
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index 98732ca34049..a7c802197ac2 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -11,7 +11,7 @@
   lapack,
   config,
   guiSupport ? false,
-  libX11,
+  libx11,
   enableShared ? !stdenv.hostPlatform.isStatic, # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174
   sse4Support ? stdenv.hostPlatform.sse4_1Support,
   avxSupport ? stdenv.hostPlatform.avxSupport,
@@ -66,7 +66,7 @@
     blas
     lapack
   ]
-  ++ lib.optionals guiSupport [ libX11 ]
+  ++ lib.optionals guiSupport [ libx11 ]
   ++ lib.optionals cudaSupport (
     with cudaPackages;
     [
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index ddca968f9f32..70ac55438b09 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -13,8 +13,8 @@
   # buildInputs
   expat,
   fontconfig,
-  libXft,
-  libXinerama,
+  libxft,
+  libxinerama,
   libxcb,
   aspell,
   xclip,
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     expat
     fontconfig
-    libXft
-    libXinerama
+    libxft
+    libxinerama
     libxcb
   ]
   ++ lib.optionals enablePlugins [
diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix
index bfcd38cc704a..0ad19f9047ff 100644
--- a/pkgs/by-name/dm/dmenu/package.nix
+++ b/pkgs/by-name/dm/dmenu/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchzip,
   fontconfig,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   writeText,
   # customization
   config,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index a15859c43049..78a2f375b132 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -17,11 +17,11 @@
   libGL,
   libGLU,
   libsm,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   libao,
   libpthread-stubs,
   libpulseaudio,
@@ -87,11 +87,11 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libsm
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxxf86vm
     libao
     libpthread-stubs
     libpulseaudio
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 3edb8c1be552..b23dab82c6a7 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -21,7 +21,7 @@
   glslang,
   gtest,
   hidapi,
-  libXdmcp,
+  libxdmcp,
   libpulseaudio,
   libspng,
   libusb1,
@@ -40,8 +40,8 @@
   alsa-lib,
   bluez,
   libGL,
-  libXext,
-  libXrandr,
+  libxext,
+  libxrandr,
   libevdev,
   udev,
   vulkan-loader,
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     gtest
     hidapi
-    libXdmcp
+    libxdmcp
     libpulseaudio
     libspng
     libusb1
@@ -117,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     bluez
     libGL
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     libevdev
     # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
     #mgba # Derivation doesn't support Darwin
diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix
index a97bf0f71987..402e0f6b927c 100644
--- a/pkgs/by-name/do/dosbox-x/package.nix
+++ b/pkgs/by-name/do/dosbox-x/package.nix
@@ -13,7 +13,7 @@
   libpng,
   libslirp,
   libxkbfile,
-  libXrandr,
+  libxrandr,
   makeWrapper,
   ncurses,
   pkg-config,
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libxkbfile
-    libXrandr
+    libxrandr
   ];
 
   # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index fecea934cee8..6a88569550ba 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -7,7 +7,7 @@
   getopt,
   glib,
   lazarus,
-  libX11,
+  libx11,
   libsForQt5,
   writableTmpDirAsHomeHook,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus
     glib
-    libX11
+    libx11
     libsForQt5.libqtpas
   ];
 
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index dca3b4a027d8..5842d7894c0b 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -14,7 +14,7 @@
   glew,
   freetype,
   libsm,
-  libXext,
+  libxext,
   libGL,
   libGLU,
   libx11,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     glew
     freetype
     libsm
-    libXext
+    libxext
     libGL
     libGLU
     libxcb
diff --git a/pkgs/by-name/dr/drumgizmo/package.nix b/pkgs/by-name/dr/drumgizmo/package.nix
index 5b37f44fabb1..cee0419ad314 100644
--- a/pkgs/by-name/dr/drumgizmo/package.nix
+++ b/pkgs/by-name/dr/drumgizmo/package.nix
@@ -7,8 +7,8 @@
   expat,
   glib,
   libjack2,
-  libXext,
-  libX11,
+  libxext,
+  libx11,
   libpng,
   libpthread-stubs,
   libsmf,
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
     expat
     glib
     libjack2
-    libXext
-    libX11
+    libxext
+    libx11
     libpng
     libpthread-stubs
     libsmf
diff --git a/pkgs/by-name/ds/dssi/package.nix b/pkgs/by-name/ds/dssi/package.nix
index f0861c5646b2..8f0d027ac89a 100644
--- a/pkgs/by-name/ds/dssi/package.nix
+++ b/pkgs/by-name/ds/dssi/package.nix
@@ -6,7 +6,7 @@
   libjack2,
   liblo,
   alsa-lib,
-  libX11,
+  libx11,
   libsndfile,
   libsm,
   libsamplerate,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     libjack2
     liblo
     alsa-lib
-    libX11
+    libx11
     libsndfile
     libsm
     libsamplerate
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 0944f6591a3b..374380073240 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -22,7 +22,7 @@
   rapidjson,
   libzip,
   curl,
-  libX11,
+  libx11,
   wayland,
   shaderc,
   spirv-cross,
@@ -248,7 +248,7 @@ let
       cpuinfo
       libzip
       curl
-      libX11
+      libx11
       wayland
       spirv-cross
       qt6.qtbase
diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index e84968bd3b57..3b282880c6f5 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -7,18 +7,18 @@
   which,
   perl,
   jq,
-  libXrandr,
+  libxrandr,
   coreutils,
   cairo,
   dbus,
   systemd,
   gdk-pixbuf,
   glib,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
   wayland,
   wayland-protocols,
-  libXinerama,
+  libxinerama,
   libnotify,
   pango,
   xorgproto,
@@ -58,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
   ]
   ++ lib.optionals withX11 [
-    libX11
-    libXScrnSaver
-    libXinerama
+    libx11
+    libxscrnsaver
+    libxinerama
     xorgproto
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals withWayland [
     wayland
diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index 748a464ad63e..280a15e8da84 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromCodeberg,
   installShellFiles,
-  libX11,
+  libx11,
   libinput,
   libxcb,
   libxkbcommon,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     wlroots_0_18
   ]
   ++ lib.optionals enableXWayland [
-    libX11
+    libx11
     libxcb-wm
     xwayland
   ];
diff --git a/pkgs/by-name/dw/dwm-status/package.nix b/pkgs/by-name/dw/dwm-status/package.nix
index c0cbb359805e..78d208e24206 100644
--- a/pkgs/by-name/dw/dwm-status/package.nix
+++ b/pkgs/by-name/dw/dwm-status/package.nix
@@ -7,7 +7,7 @@
   libnotify,
   makeWrapper,
   pkg-config,
-  libX11,
+  libx11,
   enableAlsaUtils ? true,
   alsa-utils,
   coreutils,
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
     gdk-pixbuf
     libnotify
-    libX11
+    libx11
   ];
 
   cargoHash = "sha256-o6gzP0mo7+np5Ba22gPAHcPPXoFTYThNsMr6nNC/Zm4=";
diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix
index 29660cad7c46..4956b3dd7896 100644
--- a/pkgs/by-name/dw/dwm/package.nix
+++ b/pkgs/by-name/dw/dwm/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   writeText,
   pkg-config,
   # customization
@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config;
 
   buildInputs = [
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/dw/dwmblocks/package.nix b/pkgs/by-name/dw/dwmblocks/package.nix
index 8524914d0611..409e3692f810 100644
--- a/pkgs/by-name/dw/dwmblocks/package.nix
+++ b/pkgs/by-name/dw/dwmblocks/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   patches ? [ ],
   writeText,
   conf ? null,
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     hash = "sha256-QtYQB2mvw1k2LA8D+/cVnA8+GRDWjhIM6rxfi/IGjEw=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   inherit patches;
 
diff --git a/pkgs/by-name/dz/dzen2/package.nix b/pkgs/by-name/dz/dzen2/package.nix
index 549bf4e6f732..8530be3bfcef 100644
--- a/pkgs/by-name/dz/dzen2/package.nix
+++ b/pkgs/by-name/dz/dzen2/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXft,
-  libXinerama,
-  libXpm,
+  libx11,
+  libxft,
+  libxinerama,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,10 +15,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXft
-    libXinerama
-    libXpm
+    libx11
+    libxft
+    libxinerama
+    libxpm
   ];
 
   src = fetchurl {
diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix
index 96d3f75d26b1..de0b127bc0aa 100644
--- a/pkgs/by-name/e1/e16/package.nix
+++ b/pkgs/by-name/e1/e16/package.nix
@@ -6,13 +6,13 @@
   freetype,
   imlib2,
   libsm,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxft,
+  libxinerama,
+  libxrandr,
   libpulseaudio,
   libsndfile,
   pango,
@@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     imlib2
     libsm
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXft
-    libXinerama
-    libXrandr
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxft
+    libxinerama
+    libxrandr
     libpulseaudio
     libsndfile
     pango
diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix
index c9b48d69b5a3..312ac01b2eb9 100644
--- a/pkgs/by-name/ea/eaglemode/package.nix
+++ b/pkgs/by-name/ea/eaglemode/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   perl,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
   libjpeg,
   libpng,
   libtiff,
@@ -13,8 +13,8 @@
   librsvg,
   glib,
   gtk3,
-  libXext,
-  libXxf86vm,
+  libxext,
+  libxxf86vm,
   poppler,
   vlc,
   ghostscript,
@@ -57,8 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     perl
-    libX11
-    libXinerama
+    libx11
+    libxinerama
     libjpeg
     libpng
     libtiff
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     glib
     gtk3
-    libXxf86vm
-    libXext
+    libxxf86vm
+    libxext
     poppler
     vlc
     ghostscript
diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix
index 7938b789d073..be6ae208c849 100644
--- a/pkgs/by-name/ea/easyrpg-player/package.nix
+++ b/pkgs/by-name/ea/easyrpg-player/package.nix
@@ -20,14 +20,14 @@
   libsndfile,
   libsysprof-capture,
   libvorbis,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxmp,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   mpg123,
   nlohmann_json,
   opusfile,
@@ -86,13 +86,13 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     libdecor
   ];
 
diff --git a/pkgs/by-name/eb/ebumeter/package.nix b/pkgs/by-name/eb/ebumeter/package.nix
index 0d70c6f57a9b..01aa85f8a16b 100644
--- a/pkgs/by-name/eb/ebumeter/package.nix
+++ b/pkgs/by-name/eb/ebumeter/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   libclthreads,
   libclxclient,
   libjack2,
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     libclthreads
     libclxclient
     libjack2
diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix
index 0da8dc8710c5..1bd1223b828d 100644
--- a/pkgs/by-name/ec/eclipse-mat/package.nix
+++ b/pkgs/by-name/ec/eclipse-mat/package.nix
@@ -7,9 +7,9 @@
   gtk3,
   jdk17,
   lib,
-  libX11,
-  libXrender,
-  libXtst,
+  libx11,
+  libxrender,
+  libxtst,
   makeDesktopItem,
   makeWrapper,
   shared-mime-info,
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
       lib.makeLibraryPath [
         freetype
         fontconfig
-        libX11
-        libXrender
+        libx11
+        libxrender
         zlib
       ]
     } $libCairo
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
         lib.makeLibraryPath [
           glib
           gtk3
-          libXtst
+          libxtst
           webkitgtk_4_1
         ]
       } \
@@ -103,9 +103,9 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk3
     jdk
-    libX11
-    libXrender
-    libXtst
+    libx11
+    libxrender
+    libxtst
     zlib
     shared-mime-info
     webkitgtk_4_1
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index a67d01d10575..9b0d051ac310 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -5,8 +5,8 @@
   gradle_9,
   jdk25,
   wrapGAppsHook3,
-  libXxf86vm,
-  libXtst,
+  libxxf86vm,
+  libxtst,
   libglvnd,
   glib,
   alsa-lib,
@@ -99,9 +99,9 @@ stdenv.mkDerivation rec {
     makeWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
-          libXxf86vm
+          libxxf86vm
           glib
-          libXtst
+          libxtst
           libglvnd
           alsa-lib
           ffmpeg
diff --git a/pkgs/by-name/ed/edit/package.nix b/pkgs/by-name/ed/edit/package.nix
index 0ec7d6cb04dd..7fc5627cf9c3 100644
--- a/pkgs/by-name/ed/edit/package.nix
+++ b/pkgs/by-name/ed/edit/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchgit,
   cwebbin,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   pkg-config,
   unzip,
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index 82218d5097b2..de7b73e63a7a 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -25,9 +25,9 @@
   libjpeg,
   libpng,
   libvorbis,
-  libX11,
+  libx11,
   libxkbcommon,
-  libXxf86vm,
+  libxxf86vm,
   mono,
   nlohmann_json,
   openal,
@@ -86,9 +86,9 @@ let
 
     buildInputs = [
       libGLU
-      libX11
+      libx11
       libxkbcommon
-      libXxf86vm
+      libxxf86vm
       wayland
     ];
 
@@ -277,9 +277,9 @@ let
         --prefix LD_LIBRARY_PATH : ${
           lib.makeLibraryPath [
             libGL
-            libX11
+            libx11
             libxkbcommon
-            libXxf86vm
+            libxxf86vm
             sqlite
             wayland
             egl-wayland
diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix
index 2ddfe076adaa..ecba143b71f5 100644
--- a/pkgs/by-name/eg/egl-wayland/package.nix
+++ b/pkgs/by-name/eg/egl-wayland/package.nix
@@ -8,7 +8,7 @@
   ninja,
   wayland-scanner,
   libGL,
-  libX11,
+  libx11,
   libdrm,
   wayland,
   wayland-protocols,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
     libdrm
     wayland
     wayland-protocols
diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix
index 2ce8ba592931..e5b8bcb014a8 100644
--- a/pkgs/by-name/el/elinks/package.nix
+++ b/pkgs/by-name/el/elinks/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   ncurses,
-  libX11,
+  libx11,
   bzip2,
   zlib,
   brotli,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses
-    libX11
+    libx11
     bzip2
     zlib
     brotli
diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix
index 83177cc85da2..28155d4376bd 100644
--- a/pkgs/by-name/em/emboss/package.nix
+++ b/pkgs/by-name/em/emboss/package.nix
@@ -5,9 +5,9 @@
   readline,
   perl,
   libharu,
-  libX11,
+  libx11,
   libpng,
-  libXt,
+  libxt,
   zlib,
 }:
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     libharu
     libpng
-    libX11
-    libXt
+    libx11
+    libxt
     zlib
   ];
 
diff --git a/pkgs/by-name/em/embree/package.nix b/pkgs/by-name/em/embree/package.nix
index 6a16aee8f1ed..f4eef0730150 100644
--- a/pkgs/by-name/em/embree/package.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -11,7 +11,7 @@
   libjpeg,
   libpng,
   libpthread-stubs,
-  libX11,
+  libx11,
   glib,
 }:
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     openimageio
     libjpeg
     libpng
-    libX11
+    libx11
     libpthread-stubs
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix
index d5a74025f909..3bc875b07e23 100644
--- a/pkgs/by-name/em/emptty/package.nix
+++ b/pkgs/by-name/em/emptty/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libX11,
+  libx11,
   pam,
   stdenv,
 }:
@@ -20,7 +20,7 @@ buildGoModule rec {
 
   buildInputs = [
     pam
-    libX11
+    libx11
   ];
 
   vendorHash = "sha256-PLyemAUcCz9H7+nAxftki3G7rQoEeyPzY3YUEj2RFn4=";
diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix
index 5fa0663d91e3..0ec610733fd7 100644
--- a/pkgs/by-name/em/empty-epsilon/package.nix
+++ b/pkgs/by-name/em/empty-epsilon/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   sfml,
-  libX11,
+  libx11,
   glew,
   python3,
   glm_1_0_1,
@@ -41,7 +41,7 @@ let
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       sfml
-      libX11
+      libx11
       glm_1_0_1
       SDL2
     ];
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     serious-proton
     sfml
     glew
-    libX11
+    libx11
     python3
     glm_1_0_1
     SDL2
diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix
index 37501db0af43..6c230a9456ac 100644
--- a/pkgs/by-name/em/emulsion/package.nix
+++ b/pkgs/by-name/em/emulsion/package.nix
@@ -8,11 +8,11 @@
   pkg-config,
   python3,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   libxcb,
   libxkbcommon,
   wayland,
@@ -20,11 +20,11 @@
 let
   rpathLibs = [
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxxf86vm
     libxcb
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index ed153ed6991a..f19a62b90bbb 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -7,7 +7,7 @@
   libpng,
   libjpeg,
   libogg,
-  libX11,
+  libx11,
   flac,
   glew,
   openal,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libjpeg
     libogg
-    libX11
+    libx11
     flac
     glew
     openal
diff --git a/pkgs/by-name/en/ensemble-chorus/package.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
index 17668f30ced8..a8569d929ca4 100644
--- a/pkgs/by-name/en/ensemble-chorus/package.nix
+++ b/pkgs/by-name/en/ensemble-chorus/package.nix
@@ -5,9 +5,9 @@
   fltk,
   alsa-lib,
   freetype,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   lv2,
   libjack2,
   cmake,
@@ -41,9 +41,9 @@ stdenv.mkDerivation {
     fltk
     alsa-lib
     freetype
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     lv2
     libjack2
   ];
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 5757ed9d1980..84130cbcb7aa 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -6,10 +6,10 @@
   pkg-config,
   extra-cmake-modules,
   dbus,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
-  libXtst,
+  libxi,
+  libxtst,
   libnotify,
   libxkbcommon,
   libpng,
@@ -82,9 +82,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wl-clipboard
   ]
   ++ lib.optionals x11Support [
-    libXi
-    libXtst
-    libX11
+    libxi
+    libxtst
+    libx11
     libxcb
     xclip
     xdotool
diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix
index eaa19f97dabd..1b396ad00ce0 100644
--- a/pkgs/by-name/et/ete-unwrapped/package.nix
+++ b/pkgs/by-name/et/ete-unwrapped/package.nix
@@ -11,7 +11,7 @@
   libogg,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   lua5_4,
   minizip,
   openal,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     libogg
     libpng
     libtheora
-    libX11
+    libx11
     lua5_4
     minizip
     openal
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index 86e0ad202eb4..dfbe335729c1 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -12,7 +12,7 @@
   libogg,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   lua5_4,
   minizip,
   openal,
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     libogg
     libpng
     libtheora
-    libX11
+    libx11
     lua5_4
     minizip
     openal
diff --git a/pkgs/by-name/eu/eudic/package.nix b/pkgs/by-name/eu/eudic/package.nix
index a2c486582b6f..a76c544577bd 100644
--- a/pkgs/by-name/eu/eudic/package.nix
+++ b/pkgs/by-name/eu/eudic/package.nix
@@ -7,10 +7,10 @@
   dpkg,
   makeWrapper,
   libnotify,
-  libX11,
-  libXScrnSaver,
-  libXext,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxext,
+  libxtst,
   libuuid,
   libsecret,
   xdg-utils,
@@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libnotify
-    libX11
-    libXScrnSaver
-    libXext
-    libXtst
+    libx11
+    libxscrnsaver
+    libxext
+    libxtst
     libuuid
     libsecret
     xdg-utils
diff --git a/pkgs/by-name/ex/extremetuxracer/package.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
index 8c4f315ce370..07de98eca837 100644
--- a/pkgs/by-name/ex/extremetuxracer/package.nix
+++ b/pkgs/by-name/ex/extremetuxracer/package.nix
@@ -4,16 +4,16 @@
   fetchurl,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   xorgproto,
   tcl,
   libglut,
   freetype,
   sfml_2,
-  libXi,
-  libXmu,
-  libXext,
-  libXt,
+  libxi,
+  libxmu,
+  libxext,
+  libxt,
   libsm,
   libice,
   libpng,
@@ -38,16 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libGL
-    libX11
+    libx11
     xorgproto
     tcl
     libglut
     freetype
     sfml_2
-    libXi
-    libXmu
-    libXext
-    libXt
+    libxi
+    libxmu
+    libxext
+    libxt
     libsm
     libice
     libpng
diff --git a/pkgs/by-name/ex/exult/package.nix b/pkgs/by-name/ex/exult/package.nix
index 795a56d2f1fa..02ebbe6e3810 100644
--- a/pkgs/by-name/ex/exult/package.nix
+++ b/pkgs/by-name/ex/exult/package.nix
@@ -10,7 +10,7 @@
   libogg,
   libtool,
   libvorbis,
-  libX11,
+  libx11,
   pkg-config,
   zlib,
   enableTools ? false,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     libogg
     libvorbis
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index a302fd01c7df..4506bdb27ddf 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -7,7 +7,7 @@
   jansson,
   lib,
   libGL,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libsndfile,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     jansson
     libGL
-    libX11
+    libx11
     libjpeg
     libpng
     libsndfile
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index 9c31664fdfca..600548ae87c1 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -6,7 +6,7 @@
   cmake,
   help2man,
   gzip,
-  libXt,
+  libxt,
   openusd,
   onetbb,
   vtk,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     python3Packages.pybind11
   ]
   ++ lib.optionals withUsd [
-    libXt
+    libxt
     openusd
     onetbb
   ];
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index e8893ae7f1ae..5e837a84b1e7 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -6,12 +6,12 @@
   libGL,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
   libpulseaudio,
   libxkbcommon,
   makeDesktopItem,
@@ -244,12 +244,12 @@ let
         libGL
         libice
         libsm
-        libX11
-        libXcursor
-        libXext
-        libXi
-        libXinerama
-        libXrandr
+        libx11
+        libxcursor
+        libxext
+        libxi
+        libxinerama
+        libxrandr
         libpulseaudio
         libxkbcommon
         wayland
diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 5e305778c062..764eb5252960 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -19,7 +19,7 @@
   p7zip,
   xz,
   withTTYX ? true,
-  libX11,
+  libx11,
   withGUI ? true,
   wxGTK32,
   withUCD ? true,
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    lib.optional withTTYX libX11
+    lib.optional withTTYX libx11
     ++ lib.optional withGUI wxGTK32
     ++ lib.optional withUCD libuchardet
     ++ lib.optionals withColorer [
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 60f149c76b01..4aa7b79b04e7 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -11,7 +11,7 @@
   glib,
   hwdata,
   imagemagick,
-  libXrandr,
+  libxrandr,
   libdrm,
   libelf,
   libglvnd,
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
         ++ lib.optionals x11Support [
           # At least one of them sould be present in X11 sessions for better display detection and faster WM detection.
           # The *randr ones provide multi monitor support The libxcb* ones usually have better performance.
-          libXrandr
+          libxrandr
           libxcb
           # Required by libxcb messages
           libxau
diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
index 63d8fbeb2ef9..ca24c16f02d2 100644
--- a/pkgs/by-name/fa/fastmail-desktop/linux.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -11,8 +11,8 @@
   autoPatchelfHook,
   makeWrapper,
   electron,
-  libXScrnSaver,
-  libXtst,
+  libxscrnsaver,
+  libxtst,
   libappindicator,
   libgcc,
   musl,
@@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   libPath = lib.makeLibraryPath [
-    libXScrnSaver
-    libXtst
+    libxscrnsaver
+    libxtst
     libappindicator
   ];
 
diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix
index 7bb852386840..36a76bf05353 100644
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.nix
@@ -17,7 +17,7 @@
   imagemagick,
   curl,
   sane-backends,
-  libXpm,
+  libxpm,
   libepoxy,
   pixman,
   poppler,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     sane-backends
     libdrm
-    libXpm
+    libxpm
     libepoxy
     pixman
     poppler
diff --git a/pkgs/by-name/fb/fbpanel/package.nix b/pkgs/by-name/fb/fbpanel/package.nix
index edbc4d6b3d29..85ab03cc543f 100644
--- a/pkgs/by-name/fb/fbpanel/package.nix
+++ b/pkgs/by-name/fb/fbpanel/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXmu,
-  libXpm,
+  libx11,
+  libxmu,
+  libxpm,
   gtk2,
   libpng,
   libjpeg,
@@ -30,9 +30,9 @@ stdenv.mkDerivation {
     pypy2
   ];
   buildInputs = [
-    libX11
-    libXmu
-    libXpm
+    libx11
+    libxmu
+    libxpm
     gtk2
     libpng
     libjpeg
diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix
index 8b9d74774649..bc75054d3b11 100644
--- a/pkgs/by-name/fc/fceux/package.nix
+++ b/pkgs/by-name/fc/fceux/package.nix
@@ -5,8 +5,8 @@
   cmake,
   fetchFromGitHub,
   ffmpeg,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   lua5_1,
   minizip,
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     ffmpeg
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     lua5_1
     minizip
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index 74b12d3ff4a6..11bf3af92722 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -20,17 +20,17 @@
   gtk3,
   lib,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libappindicator-gtk3,
   libcxx,
   libdbusmenu,
@@ -95,17 +95,17 @@ let
     glibc
     gnutls
     libGL
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libappindicator-gtk3
     libcxx
     libdbusmenu
@@ -152,8 +152,8 @@ stdenv.mkDerivation {
     # for autopatchelf
     alsa-lib
     cups
-    libXdamage
-    libXtst
+    libxdamage
+    libxtst
     libdrm
     libgcrypt
     libpulseaudio
diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix
index 8ff68f9e5e72..11aba642b5d7 100644
--- a/pkgs/by-name/fe/ferrishot/package.nix
+++ b/pkgs/by-name/fe/ferrishot/package.nix
@@ -6,7 +6,7 @@
   makeBinaryWrapper,
   writableTmpDirAsHomeHook,
   libGL,
-  libX11,
+  libx11,
   libxkbcommon,
   libxcb,
   wayland,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         libGL
       ]
       ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libX11
+        libx11
         libxkbcommon
         wayland
       ];
diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix
index 09738ab1d6cd..6b3a72a9d94e 100644
--- a/pkgs/by-name/fi/filtr/package.nix
+++ b/pkgs/by-name/fi/filtr/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/fi/find-cursor/package.nix b/pkgs/by-name/fi/find-cursor/package.nix
index c13e901dc427..9a989cdd0945 100644
--- a/pkgs/by-name/fi/find-cursor/package.nix
+++ b/pkgs/by-name/fi/find-cursor/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXdamage,
-  libXrender,
-  libXcomposite,
-  libXext,
+  libx11,
+  libxdamage,
+  libxrender,
+  libxcomposite,
+  libxext,
   installShellFiles,
   git,
 }:
@@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     git
   ];
   buildInputs = [
-    libX11
-    libXdamage
-    libXrender
-    libXcomposite
-    libXext
+    libx11
+    libxdamage
+    libxrender
+    libxcomposite
+    libxext
   ];
   preInstall = "mkdir -p $out/share/man/man1";
   installFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index 1c82e81a96a2..8891d587c8f7 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -9,11 +9,11 @@
   cmake,
   fontconfig,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
 
@@ -69,11 +69,11 @@ let
   ];
 
   x11Libs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/fl/fladder/package.nix b/pkgs/by-name/fl/fladder/package.nix
index 9a9f0b224a06..687042808b45 100644
--- a/pkgs/by-name/fl/fladder/package.nix
+++ b/pkgs/by-name/fl/fladder/package.nix
@@ -5,8 +5,8 @@
 
   alsa-lib,
   libdisplay-info,
-  libXpresent,
-  libXScrnSaver,
+  libxpresent,
+  libxscrnsaver,
   libepoxy,
   mpv-unwrapped,
 
@@ -50,8 +50,8 @@ flutter.buildFlutterApplication rec {
     alsa-lib
     libdisplay-info
     mpv-unwrapped
-    libXpresent
-    libXScrnSaver
+    libxpresent
+    libxscrnsaver
   ]
   ++ lib.optionals (targetFlutterPlatform == "linux") [
     libepoxy
diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix
index da5906e6278a..0dea80a1c93e 100644
--- a/pkgs/by-name/fl/flex-launcher/package.nix
+++ b/pkgs/by-name/fl/flex-launcher/package.nix
@@ -4,7 +4,7 @@
   SDL2,
   SDL2_ttf,
   SDL2_image,
-  libX11,
+  libx11,
   cmake,
   validatePkgConfig,
   inih,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_ttf
     SDL2_image
-    libX11
+    libx11
     inih
   ];
 
diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
index a46775a3ac8e..858d1f0907d7 100644
--- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
+++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
@@ -20,9 +20,9 @@
   boost,
   libGLU,
   libGL,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
 }:
 
 stdenv.mkDerivation {
@@ -45,9 +45,9 @@ stdenv.mkDerivation {
 
   buildInputs =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXinerama
-      libXrandr
+      libx11
+      libxinerama
+      libxrandr
       libGLU
       libGL
     ]
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 055af0bbdb2c..52e11166b4d8 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -13,12 +13,12 @@
   plib,
   libsm,
   libunwind,
-  libX11,
+  libx11,
   xorgproto,
-  libXext,
-  libXi,
-  libXmu,
-  libXt,
+  libxext,
+  libxi,
+  libxmu,
+  libxt,
   simgear,
   zlib,
   boost,
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     plib
     libsm
     libunwind
-    libX11
+    libx11
     xorgproto
-    libXext
-    libXi
-    libXmu
-    libXt
+    libxext
+    libxi
+    libxmu
+    libxt
     (simgear.override { openscenegraph = openscenegraph; })
     zlib
     boost
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
index 10514ec51d32..35b874442f70 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
@@ -8,7 +8,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   runtimeDependencies = [
diff --git a/pkgs/by-name/fl/fltk_1_3/package.nix b/pkgs/by-name/fl/fltk_1_3/package.nix
index 2b2242107d8a..41762add1ce7 100644
--- a/pkgs/by-name/fl/fltk_1_3/package.nix
+++ b/pkgs/by-name/fl/fltk_1_3/package.nix
@@ -9,13 +9,13 @@
   libpng,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXfixes,
-  libXcursor,
-  libXft,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxfixes,
+  libxcursor,
+  libxft,
+  libxrender,
 
   withGL ? true,
   libGL,
@@ -91,13 +91,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ]
   ++ lib.optionals withXorg [
-    libX11
-    libXext
-    libXinerama
-    libXfixes
-    libXcursor
-    libXft
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxfixes
+    libxcursor
+    libxft
+    libxrender
   ]
   ++ lib.optionals withCairo [
     cairo
diff --git a/pkgs/by-name/fl/fltk_1_4/package.nix b/pkgs/by-name/fl/fltk_1_4/package.nix
index b6da2c585748..e338af205131 100644
--- a/pkgs/by-name/fl/fltk_1_4/package.nix
+++ b/pkgs/by-name/fl/fltk_1_4/package.nix
@@ -9,13 +9,13 @@
   libpng,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXfixes,
-  libXcursor,
-  libXft,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxfixes,
+  libxcursor,
+  libxft,
+  libxrender,
 
   withGL ? true,
   libGL,
@@ -107,13 +107,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ]
   ++ lib.optionals withXorg [
-    libX11
-    libXext
-    libXinerama
-    libXfixes
-    libXcursor
-    libXft
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxfixes
+    libxcursor
+    libxft
+    libxrender
   ]
   ++ lib.optionals withWayland [
     wayland
diff --git a/pkgs/by-name/fl/fluida-lv2/package.nix b/pkgs/by-name/fl/fluida-lv2/package.nix
index 71549bdd7721..c1ba67537dbc 100644
--- a/pkgs/by-name/fl/fluida-lv2/package.nix
+++ b/pkgs/by-name/fl/fluida-lv2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   cairo,
   lv2,
   fluidsynth,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     fluidsynth
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix
index 9f4f74085a5a..248be04fd1d0 100644
--- a/pkgs/by-name/fl/fluxbox/package.nix
+++ b/pkgs/by-name/fl/fluxbox/package.nix
@@ -5,13 +5,13 @@
   pkg-config,
   freetype,
   fribidi,
-  libXext,
-  libXft,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libxext,
+  libxft,
+  libxpm,
+  libxrandr,
+  libxrender,
   xorgproto,
-  libXinerama,
+  libxinerama,
   imlib2,
 }:
 
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freetype
     fribidi
-    libXext
-    libXft
-    libXpm
-    libXrandr
-    libXrender
+    libxext
+    libxft
+    libxpm
+    libxrandr
+    libxrender
     xorgproto
-    libXinerama
+    libxinerama
     imlib2
   ];
 
diff --git a/pkgs/by-name/fo/focus/package.nix b/pkgs/by-name/fo/focus/package.nix
index ef46548cdbb6..10ffb2579d70 100644
--- a/pkgs/by-name/fo/focus/package.nix
+++ b/pkgs/by-name/fo/focus/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation {
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/by-name/fo/fox/package.nix b/pkgs/by-name/fo/fox/package.nix
index 5862d1403b4f..a9ede51b9e9d 100644
--- a/pkgs/by-name/fo/fox/package.nix
+++ b/pkgs/by-name/fo/fox/package.nix
@@ -8,10 +8,10 @@
   zlib,
   bzip2,
   mesa_glu,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXft,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxft,
   cups,
 }:
 
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
     zlib
     bzip2
     mesa_glu
-    libXcursor
-    libXext
-    libXrandr
-    libXft
+    libxcursor
+    libxext
+    libxrandr
+    libxft
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cups
diff --git a/pkgs/by-name/fo/fox_1_6/package.nix b/pkgs/by-name/fo/fox_1_6/package.nix
index 0973212a551b..626ee91ebf53 100644
--- a/pkgs/by-name/fo/fox_1_6/package.nix
+++ b/pkgs/by-name/fo/fox_1_6/package.nix
@@ -7,13 +7,13 @@
   libtiff,
   zlib,
   bzip2,
-  libXcursor,
-  libXrandr,
+  libxcursor,
+  libxrandr,
   libGLU,
   libGL,
-  libXext,
-  libXft,
-  libXfixes,
+  libxext,
+  libxft,
+  libxfixes,
   mesa,
   xinput,
 }:
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
     libtiff
     zlib
     bzip2
-    libXcursor
-    libXrandr
-    libXext
-    libXft
+    libxcursor
+    libxrandr
+    libxext
+    libxft
     libGLU
     libGL
-    libXfixes
+    libxfixes
     xinput
   ];
 
diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index fceb3fd10547..3a9af09b7f09 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -8,12 +8,12 @@
   pkg-config,
   makeWrapper,
   zlib,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libXi,
-  libXext,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libxi,
+  libxext,
   libGLU,
   alsa-lib,
   fontconfig,
@@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
     alsa-lib
     fontconfig
     libGLU
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index c98d0a4cd32d..9bee57d7e7fd 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libredwg,
   libspnav,
-  libXmu,
+  libxmu,
   medfile,
   ninja,
   ode,
@@ -81,7 +81,7 @@ freecad-utils.makeCustomizable (
       gts
       hdf5
       libGLU
-      libXmu
+      libxmu
       libspnav
       medfile
       ode
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index 028bb23b892a..047ff3810142 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchurl,
   libice,
-  libXext,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libxext,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   libGLX,
   libGLU,
   cmake,
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libice
-    libXext
-    libXi
-    libXrandr
-    libXxf86vm
+    libxext
+    libxi
+    libxrandr
+    libxxf86vm
     libGLU
   ];
 
diff --git a/pkgs/by-name/fr/freenect/package.nix b/pkgs/by-name/fr/freenect/package.nix
index 437aa1f39da1..96de60571fe8 100644
--- a/pkgs/by-name/fr/freenect/package.nix
+++ b/pkgs/by-name/fr/freenect/package.nix
@@ -8,8 +8,8 @@
   libglut,
   libGLU,
   libGL,
-  libXi,
-  libXmu,
+  libxi,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     libglut
     libGLU
     libGL
-    libXi
-    libXmu
+    libxi
+    libxmu
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix
index ef2d48c49ddc..8ccd3ff08afc 100644
--- a/pkgs/by-name/fr/freepv/package.nix
+++ b/pkgs/by-name/fr/freepv/package.nix
@@ -8,10 +8,10 @@
   libglut,
   zlib,
   cmake,
-  libX11,
+  libx11,
   libxml2,
   libpng,
-  libXxf86vm,
+  libxxf86vm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libglut
     zlib
-    libX11
+    libx11
     libxml2
     libpng
-    libXxf86vm
+    libxxf86vm
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index 5e28584f2659..67a1f72cbfff 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -19,17 +19,17 @@
   pkcs11helper,
   uriparser,
   zlib,
-  libX11,
-  libXcursor,
-  libXdamage,
-  libXdmcp,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXtst,
-  libXv,
+  libx11,
+  libxcursor,
+  libxdamage,
+  libxdmcp,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxtst,
+  libxv,
   libxkbcommon,
   libxkbfile,
   wayland,
@@ -117,17 +117,17 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     glib
     icu
-    libX11
-    libXcursor
-    libXdamage
-    libXdmcp
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXtst
-    libXv
+    libx11
+    libxcursor
+    libxdamage
+    libxdmcp
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxtst
+    libxv
     libjpeg_turbo
     libkrb5
     libopus
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 16d6e3104982..03c8aa94be87 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -16,7 +16,7 @@
   libsm,
   libsndfile,
   libogg,
-  libX11,
+  libx11,
   nettle,
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsndfile
     libogg
     libsm
-    libX11
+    libx11
     nettle
   ];
 
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 3f76a5ff11a6..9eeadf410d0a 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchFromGitHub,
   sbcl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libice,
   libsm,
-  libXt,
-  libXau,
-  libXdmcp,
+  libxt,
+  libxau,
+  libxdmcp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     sbcl
-    libX11
-    libXpm
+    libx11
+    libxpm
     libice
     libsm
-    libXt
-    libXau
-    libXdmcp
+    libxt
+    libxau
+    libxdmcp
   ];
 
   # Remove when updating to next version
diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix
index fd18ccd9f1a1..d99f163a996b 100644
--- a/pkgs/by-name/fs/fsg/package.nix
+++ b/pkgs/by-name/fs/fsg/package.nix
@@ -8,7 +8,7 @@
   libGLU,
   libGL,
   wxGTK32,
-  libX11,
+  libx11,
   xorgproto,
   runtimeShell,
 }:
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     wxGTK32
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/ft/fte/package.nix b/pkgs/by-name/ft/fte/package.nix
index 83e4c33e04de..a06e3aee5abf 100644
--- a/pkgs/by-name/ft/fte/package.nix
+++ b/pkgs/by-name/ft/fte/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   unzip,
   perl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   gpm,
   ncurses,
   slang,
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     perl
-    libX11
-    libXpm
+    libx11
+    libxpm
     gpm
     ncurses
     slang
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 09e633804f6c..0591915c2523 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -11,7 +11,7 @@
   fmt,
   freetype,
   libsndfile,
-  libX11,
+  libx11,
   libGL,
   rtmidi,
   SDL2,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     # To offer scaling detection on X11, furnace checks if libX11.so is available via dlopen and uses some of its functions
     # But it's being linked against a versioned libX11.so.VERSION via SDL, so the unversioned one is not on the rpath
     substituteInPlace src/gui/scaling.cpp \
-      --replace-fail 'libX11.so' '${lib.getLib libX11}/lib/libX11.so'
+      --replace-fail 'libX11.so' '${lib.getLib libx11}/lib/libX11.so'
   '';
 
   nativeBuildInputs = [
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
     alsa-lib
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index d886799f2ab2..1fab11c2c4bd 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -7,11 +7,11 @@
   fontconfig,
   freetype,
   fribidi,
-  libXcursor,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXt,
+  libxcursor,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxt,
   libpng,
   librsvg,
   libstroke,
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     fribidi
-    libXcursor
-    libXft
-    libXinerama
-    libXpm
-    libXt
+    libxcursor
+    libxft
+    libxinerama
+    libxpm
+    libxt
     libpng
     librsvg
     libxslt
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 41b13cffc17a..57e0fb1fd6a3 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -8,14 +8,14 @@
   freetype,
   fribidi,
   libsm,
-  libX11,
-  libXcursor,
-  libXft,
-  libXi,
-  libXinerama,
-  libXpm,
-  libXrandr,
-  libXt,
+  libx11,
+  libxcursor,
+  libxft,
+  libxi,
+  libxinerama,
+  libxpm,
+  libxrandr,
+  libxt,
   libevent,
   libintl,
   libpng,
@@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fribidi
     libsm
-    libX11
-    libXcursor
-    libXft
-    libXi
-    libXinerama
-    libXpm
-    libXrandr
-    libXt
+    libx11
+    libxcursor
+    libxft
+    libxi
+    libxinerama
+    libxpm
+    libxrandr
+    libxt
     libevent
     libintl
     libpng
@@ -114,6 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/fvwmorg/fvwm3/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index b014cc4fb22b..6599037f632f 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -4,12 +4,12 @@
   fetchFromGitHub,
 
   libGL,
-  libX11,
-  libXcursor,
-  libXinerama,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxinerama,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   pkg-config,
 }:
 
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   buildInputs = [
     libGL
-    libX11
-    libXcursor
-    libXinerama
-    libXi
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxinerama
+    libxi
+    libxrandr
+    libxxf86vm
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix
index 0cdae05284f4..c5f3ede58a80 100644
--- a/pkgs/by-name/ga/gamehub/package.nix
+++ b/pkgs/by-name/ga/gamehub/package.nix
@@ -16,7 +16,7 @@
   sqlite,
   # webkitgtk_4_0,
   libmanette,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     libgee
     libmanette
     libsoup_2_4
-    libXtst
+    libxtst
     sqlite
     # webkitgtk_4_0
   ];
diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix
index 8b58b9ce722f..cf2eb205347e 100644
--- a/pkgs/by-name/ga/gate12/package.nix
+++ b/pkgs/by-name/ga/gate12/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index 2a6fda48b895..6fba672a3fe6 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
   pkg-config,
   libGL,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXinerama,
-  libXi,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxinerama,
+  libxi,
+  libxxf86vm,
   mupdf,
   fontconfig,
   freetype,
@@ -42,12 +42,12 @@ buildGoModule rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
-    libXxf86vm
+    libx11
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
+    libxxf86vm
     fontconfig
     freetype
   ];
diff --git a/pkgs/by-name/gd/gd/package.nix b/pkgs/by-name/gd/gd/package.nix
index bb1a9c80bffe..550016b21900 100644
--- a/pkgs/by-name/gd/gd/package.nix
+++ b/pkgs/by-name/gd/gd/package.nix
@@ -12,7 +12,7 @@
   libwebp,
   libtiff,
   withXorg ? true,
-  libXpm,
+  libxpm,
   libavif,
   fontconfig,
   freetype,
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals withXorg [
     fontconfig
-    libXpm
+    libxpm
   ];
 
   outputs = [
diff --git a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
index 01ef50d256b9..0dcef5de2295 100644
--- a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
+++ b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
@@ -9,7 +9,7 @@
   docbook_xml_dtd_43,
   gtk-doc,
   gdk-pixbuf,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     gdk-pixbuf
-    libX11
+    libx11
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index ce03f3130dca..72a3fe6d97e4 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -11,8 +11,8 @@
   json-glib,
   itstool,
   accountsservice,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   gnome,
   systemd,
@@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     gtk3
     keyutils
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     libgudev
     libselinux
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index ef6f60a71c88..f62e4c0c4db6 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -11,10 +11,10 @@
   libGL,
   libGLU,
   libGLX,
-  libX11,
-  libXext,
-  libXmu,
-  libXpm,
+  libx11,
+  libxext,
+  libxmu,
+  libxpm,
   motif,
   python3,
   qt5,
@@ -87,11 +87,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     lib.optionals enableOpenGLX11 [
       libGLU
-      libXext
-      libXmu
+      libxext
+      libxmu
     ]
     ++ lib.optionals enableInventor [
-      libXpm
+      libxpm
       coin3d
       soxt
       motif
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableOpenGLX11 [
     libGL
-    libX11
+    libx11
   ]
   ++ lib.optionals enableXM [ motif ]
   ++ lib.optionals enableQt [ qt5.qtbase ];
diff --git a/pkgs/by-name/ge/gem/package.nix b/pkgs/by-name/ge/gem/package.nix
index db8427984d0d..b45aec1b6187 100644
--- a/pkgs/by-name/ge/gem/package.nix
+++ b/pkgs/by-name/ge/gem/package.nix
@@ -10,7 +10,7 @@
   glew,
   libglut,
   libv4l,
-  libX11,
+  libx11,
   file,
 }:
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     glew
     libglut
     libv4l
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index 9bfd3180426d..47a387596137 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -15,7 +15,7 @@
   libpng,
   libvlc,
   libvorbis,
-  libX11,
+  libx11,
   openal,
   python3,
   zlib,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libvlc
     libvorbis
-    libX11
+    libx11
     openal
     python3
     zlib
diff --git a/pkgs/by-name/ge/genymotion/package.nix b/pkgs/by-name/ge/genymotion/package.nix
index 1cfe08fb9dd7..97b751b4e336 100644
--- a/pkgs/by-name/ge/genymotion/package.nix
+++ b/pkgs/by-name/ge/genymotion/package.nix
@@ -10,7 +10,7 @@
   libx11,
   libxkbcommon,
   xdg-utils,
-  libXrender,
+  libxrender,
   fontconfig,
   freetype,
   systemd,
@@ -20,9 +20,9 @@
   gtk3,
   pixman,
   # For glewinfo
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
 }:
 
 let
@@ -32,11 +32,11 @@ let
     glib
     libx11
     libxkbcommon
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
     libGL
-    libXrender
+    libxrender
     fontconfig
     freetype
     systemd
diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix
index 2c4b3610c3f5..30e47e5149f9 100644
--- a/pkgs/by-name/ge/geogebra/package.nix
+++ b/pkgs/by-name/ge/geogebra/package.nix
@@ -86,7 +86,7 @@ let
     installPhase = ''
       install -D geogebra/* -t "$out/libexec/geogebra/"
 
-      # The bundled jogl (required for 3D graphics) links to libXxf86vm, and loads libGL at runtime
+      # The bundled jogl (required for 3D graphics) links to libxxf86vm, and loads libGL at runtime
       # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation"
       makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
         --prefix LD_LIBRARY_PATH : "${
diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix
index 2083993f076d..5b3460b94508 100644
--- a/pkgs/by-name/ge/geonkick/package.nix
+++ b/pkgs/by-name/ge/geonkick/package.nix
@@ -8,7 +8,7 @@
   rapidjson,
   libjack2,
   lv2,
-  libX11,
+  libx11,
   cairo,
   openssl,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
     libjack2
     lv2
-    libX11
+    libx11
     cairo
     openssl
   ];
diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix
index 620bc0e4d4ca..a1c769d05769 100644
--- a/pkgs/by-name/gf/gf/package.nix
+++ b/pkgs/by-name/gf/gf/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   makeWrapper,
   fetchFromGitHub,
-  libX11,
+  libx11,
   pkg-config,
   gdb,
   freetype,
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     gdb
   ]
   ++ lib.optional freetypeSupport freetype;
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 67a11ffef607..dd0372e8cc34 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   python3,
   wayland,
-  libX11,
+  libx11,
   libxcb,
   lz4,
   vulkan-loader,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     lz4
     python3
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 41833530c66e..b3b2c749d78f 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -13,7 +13,7 @@
   gtk4-layer-shell,
   harfbuzz,
   libGL,
-  libX11,
+  libx11,
   libadwaita,
   ncurses,
   nixosTests,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # GTK frontend
     libadwaita
-    libX11
+    libx11
     gtk4-layer-shell
 
     # OpenGL renderer
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index e680366bd2fc..8f9e3f2db030 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -14,8 +14,8 @@
   jack2,
   alsa-lib,
   libpulseaudio,
-  libXpm,
-  libXrandr,
+  libxpm,
+  libxrandr,
   flac,
   libogg,
   libvorbis,
@@ -64,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     jack2
     libGL
-    libXpm
-    libXrandr
+    libxpm
+    libxrandr
     libogg
     libopus
     libpulseaudio
diff --git a/pkgs/by-name/gi/gifsicle/package.nix b/pkgs/by-name/gi/gifsicle/package.nix
index 17149ea57fd5..3ec03e9d824d 100644
--- a/pkgs/by-name/gi/gifsicle/package.nix
+++ b/pkgs/by-name/gi/gifsicle/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   xorgproto,
-  libXt,
-  libX11,
+  libxt,
+  libx11,
   gifview ? false,
   static ? stdenv.hostPlatform.isStatic,
 }:
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optionals gifview [
     xorgproto
-    libXt
-    libX11
+    libxt
+    libx11
   ];
 
   configureFlags = lib.optional (!gifview) "--disable-gifview";
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 9091a57b7c83..4f39281009ae 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -26,17 +26,17 @@
   gtk3,
   krb5,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libgbm,
   libgnome-keyring,
@@ -110,15 +110,15 @@ let
       stdenv.cc.cc
       curlWithGnuTls
       udev
-      libX11
-      libXext
-      libXcursor
-      libXi
+      libx11
+      libxext
+      libxcursor
+      libxi
       libxcb
       glib
-      libXScrnSaver
+      libxscrnsaver
       libxkbfile
-      libXtst
+      libxtst
       nss
       nspr
       cups
@@ -126,16 +126,16 @@ let
       expat
       gdk-pixbuf
       dbus
-      libXdamage
-      libXrandr
+      libxdamage
+      libxrandr
       atk
       pango
       cairo
       freetype
       fontconfig
-      libXcomposite
-      libXfixes
-      libXrender
+      libxcomposite
+      libxfixes
+      libxrender
       gtk3
       libgnome-keyring
       openssl
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 806d99f17a1d..724f5afaf7f9 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   glib,
   gtk2,
-  libX11,
+  libx11,
   libsm,
   libice,
   which,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     glib
     gtk2
-    libX11
+    libx11
     libsm
     libice
   ];
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   # Makefiles are patched to fix references to `/usr/X11R6' and to add
-  # `-lX11' to make sure libX11's store path is in the RPATH.
+  # `-lX11' to make sure libx11's store path is in the RPATH.
   postPatch = ''
     echo "patching makefiles..."
     for i in Makefile src/Makefile server/Makefile
     do
-      sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
+      sed -i "$i" -e "s|/usr/X11R6|${libx11.dev}|g ; s|-lICE|-lX11 -lICE|g"
     done
   '';
 
diff --git a/pkgs/by-name/gl/gl-gsync-demo/package.nix b/pkgs/by-name/gl/gl-gsync-demo/package.nix
index b8ce7e582627..b1cd39c7faa8 100644
--- a/pkgs/by-name/gl/gl-gsync-demo/package.nix
+++ b/pkgs/by-name/gl/gl-gsync-demo/package.nix
@@ -1,10 +1,10 @@
 {
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libglut,
   glew,
-  libXext,
+  libxext,
   linuxPackages,
   lib,
 }:
@@ -25,11 +25,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libglut
     glew
     libXNVCtrl
-    libXext
+    libxext
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
index 11aec019f8e3..0e3e6ae66d79 100644
--- a/pkgs/by-name/gl/glamoroustoolkit/package.nix
+++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix
@@ -11,12 +11,12 @@
   freetype,
   glib,
   gtk3,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
   libxkbcommon,
   libgit2,
   libglvnd,
@@ -86,12 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
         freetype
         glib
         gtk3
-        libX11
-        libXcursor
-        libXext
-        libXi
-        libXrandr
-        libXrender
+        libx11
+        libxcursor
+        libxext
+        libxi
+        libxrandr
+        libxrender
         libxkbcommon
         libglvnd
         libuuid
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index ca8691ca493a..3c3e1f120c48 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -4,13 +4,13 @@
   writeScript,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   python3,
-  libXrandr,
-  libXrender,
+  libxrandr,
+  libxrender,
   libpulseaudio,
-  libXcomposite,
+  libxcomposite,
   enableGlfw ? false,
   glfw,
   runtimeShell,
@@ -46,12 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxrandr
+    libxrender
     libpulseaudio
-    libXcomposite
+    libxcomposite
   ]
   ++ optional enableGlfw glfw;
 
diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix
index f769cf015daa..aeef9dcd1248 100644
--- a/pkgs/by-name/gl/gle/package.nix
+++ b/pkgs/by-name/gl/gle/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   autoreconfHook,
   libglut,
-  libX11,
-  libXt,
-  libXmu,
-  libXi,
-  libXext,
+  libx11,
+  libxt,
+  libxmu,
+  libxi,
+  libxext,
   libGL,
   libGLU,
 }:
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     libglut
-    libX11
-    libXt
-    libXmu
-    libXi
-    libXext
+    libx11
+    libxt
+    libxmu
+    libxi
+    libxext
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix
index 5efd402f1f02..bc9265b05632 100644
--- a/pkgs/by-name/gl/glew/package.nix
+++ b/pkgs/by-name/gl/glew/package.nix
@@ -5,9 +5,9 @@
   fetchpatch,
   cmake,
   libGLU,
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
   enableEGL ? (!stdenv.hostPlatform.isDarwin),
   testers,
   mesa,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
   ];
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h
 
diff --git a/pkgs/by-name/gl/glew_1_10/package.nix b/pkgs/by-name/gl/glew_1_10/package.nix
index 9a9489e1065c..5160b95ef95d 100644
--- a/pkgs/by-name/gl/glew_1_10/package.nix
+++ b/pkgs/by-name/gl/glew_1_10/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   libGLU,
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
   testers,
   mesa,
 }:
@@ -20,9 +20,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
   ];
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h
 
diff --git a/pkgs/by-name/gl/glfw2/package.nix b/pkgs/by-name/gl/glfw2/package.nix
index ab12c967942f..fb59752adba1 100644
--- a/pkgs/by-name/gl/glfw2/package.nix
+++ b/pkgs/by-name/gl/glfw2/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   libGLU,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index 66598b737222..19893ccf8590 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -6,13 +6,13 @@
   pkg-config,
   libGL,
   vulkan-loader,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libX11,
-  libXi,
-  libXext,
-  libXxf86vm,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libx11,
+  libxi,
+  libxext,
+  libxxf86vm,
   fixDarwinDylibNames,
   wayland,
   wayland-scanner,
@@ -60,13 +60,13 @@ stdenv.mkDerivation {
     wayland
     wayland-protocols
     libxkbcommon
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
-    libXxf86vm
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
+    libxxf86vm
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix
index 004b11f3ee32..84176ed6cc96 100644
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@@ -9,7 +9,7 @@
   wayland-scanner,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   libGL,
   libdrm,
   udev,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libjpeg
     libpng
-    libX11
+    libx11
     libdrm
     udev
     wayland
diff --git a/pkgs/by-name/gl/glpaper/package.nix b/pkgs/by-name/gl/glpaper/package.nix
index ae19243afdb8..d5e986399fcb 100644
--- a/pkgs/by-name/gl/glpaper/package.nix
+++ b/pkgs/by-name/gl/glpaper/package.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   wayland,
-  libX11,
+  libx11,
   libGL,
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     wayland
-    libX11 # required by libglvnd
+    libx11 # required by libglvnd
     libGL
   ];
 
diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix
index 8f323914fee7..1ee1a89b8b1e 100644
--- a/pkgs/by-name/gl/glslviewer/package.nix
+++ b/pkgs/by-name/gl/glslviewer/package.nix
@@ -5,12 +5,12 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libXi,
-  libXext,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libxi,
+  libxext,
   libGLU,
   ffmpeg_7,
   ncurses,
@@ -32,12 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
     libGLU
     ncurses
     ffmpeg_7
diff --git a/pkgs/by-name/gl/glui/package.nix b/pkgs/by-name/gl/glui/package.nix
index e45437749789..d3569d97177d 100644
--- a/pkgs/by-name/gl/glui/package.nix
+++ b/pkgs/by-name/gl/glui/package.nix
@@ -5,10 +5,10 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     libglut
     libGLU
     libGL
-    libXmu
-    libXext
-    libX11
-    libXi
+    libxmu
+    libxext
+    libx11
+    libxi
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix
index 05e039b4cd15..02d74a40179b 100644
--- a/pkgs/by-name/gm/gmic/package.nix
+++ b/pkgs/by-name/gm/gmic/package.nix
@@ -15,8 +15,8 @@
   gnused,
   graphicsmagick,
   jq,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libjpeg,
   libpng,
   libtiff,
@@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     cimg
     fftw
     graphicsmagick
-    libX11
-    libXext
+    libx11
+    libxext
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index 3ffad3a901a7..4c1debd66865 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -61,8 +61,8 @@
   lcms2,
   libgbm,
   libGL,
-  libXi,
-  libX11,
+  libxi,
+  libx11,
   libxkbcommon,
   libsoup_3,
   libxml2,
@@ -168,8 +168,8 @@ stdenv.mkDerivation (finalAttrs: {
     lcms2 # required by mutter-clutter
     libgbm
     libGL # for egl, required by mutter-clutter
-    libXi # required by libmutter
-    libX11
+    libxi # required by libmutter
+    libx11
     libxkbcommon
     libsoup_3
     libxml2
diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix
index 3db12b924fda..0682ff350431 100644
--- a/pkgs/by-name/gn/gnustep-back/package.nix
+++ b/pkgs/by-name/gn/gnustep-back/package.nix
@@ -6,8 +6,8 @@
   fontconfig,
   freetype,
   gnustep-gui,
-  libXft,
-  libXmu,
+  libxft,
+  libxmu,
   pkg-config,
   wrapGNUstepAppsHook,
 }:
@@ -30,8 +30,8 @@ clangStdenv.mkDerivation (finalAttrs: {
     cairo
     fontconfig
     freetype
-    libXft
-    libXmu
+    libxft
+    libxmu
   ];
 
   propagatedBuildInputs = [ gnustep-gui ];
diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index 859bf07534fd..cdc4390e4071 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "go-ios";
-  version = "1.0.193";
+  version = "1.0.202";
 
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
     rev = "v${version}";
-    sha256 = "sha256-l5ob2wnUOHgR8awPkCBKPCFBEQhrDflN+scUXm7290o=";
+    sha256 = "sha256-GC0wNOnfT9eCDKvqVKbmuMOumRb4BN1uHAOoEOLwNYc=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 4372f564c8c2..e6b1c27668c1 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -8,7 +8,7 @@
   zlib,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   SDL2,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libGLU
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 6e36774da1b8..9ec67da5b56d 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -25,20 +25,20 @@
   libdrm,
   libglvnd,
   libkrb5,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   libxkbcommon,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
   libxshmfence,
-  libXtst,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -135,20 +135,20 @@ let
     libglvnd
     libkrb5
     libpng
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     libxkbcommon
-    libXrandr
-    libXrender
-    libXScrnSaver
+    libxrandr
+    libxrender
+    libxscrnsaver
     libxshmfence
-    libXtst
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/go/gopher64/package.nix b/pkgs/by-name/go/gopher64/package.nix
index ae604f8b3169..77353e284318 100644
--- a/pkgs/by-name/go/gopher64/package.nix
+++ b/pkgs/by-name/go/gopher64/package.nix
@@ -7,10 +7,10 @@
 
   bzip2,
   libGL,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxkbcommon,
-  libXi,
+  libxi,
   moltenvk,
   sdl3,
   wayland,
@@ -77,9 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxkbcommon
 
     # for X11
-    libX11
-    libXcursor
-    libXi
+    libx11
+    libxcursor
+    libxi
 
     # for wayland
     wayland
diff --git a/pkgs/by-name/go/gorilla-bin/package.nix b/pkgs/by-name/go/gorilla-bin/package.nix
index fb7a79e47675..366fe54ae811 100644
--- a/pkgs/by-name/go/gorilla-bin/package.nix
+++ b/pkgs/by-name/go/gorilla-bin/package.nix
@@ -4,13 +4,13 @@
   patchelf,
   lib,
   stdenv,
-  libXft,
-  libX11,
+  libxft,
+  libx11,
   freetype,
   fontconfig,
-  libXrender,
-  libXScrnSaver,
-  libXext,
+  libxrender,
+  libxscrnsaver,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
     let
       interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
       libPath = lib.makeLibraryPath [
-        libXft
-        libX11
+        libxft
+        libx11
         freetype
         fontconfig
-        libXrender
-        libXScrnSaver
-        libXext
+        libxrender
+        libxscrnsaver
+        libxext
       ];
     in
     ''
diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 6665a892c2d1..e6fca7f05e49 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -17,11 +17,11 @@
   wayland,
   wayland-scanner,
   nix-update-script,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxi,
+  libxrandr,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -67,11 +67,11 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
-    libX11
+    libx11
     libxcb
-    libXcursor
-    libXi
-    libXrandr
+    libxcursor
+    libxi
+    libxrandr
   ];
 
   # Tests rely on local files, so disable them. (I'm too lazy to patch it.)
diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix
index 8f12dbd7d1b0..10571d3ea43f 100644
--- a/pkgs/by-name/go/gotraceui/package.nix
+++ b/pkgs/by-name/go/gotraceui/package.nix
@@ -4,10 +4,10 @@
   pkg-config,
   buildGoModule,
   libGL,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXfixes,
+  libxcursor,
+  libxfixes,
   libxkbcommon,
   vulkan-headers,
   wayland,
@@ -42,10 +42,10 @@ buildGoModule rec {
     vulkan-headers
     libxkbcommon
     wayland
-    libX11
+    libx11
     libxcb
-    libXcursor
-    libXfixes
+    libxcursor
+    libxfixes
     libGL
   ];
 
diff --git a/pkgs/by-name/go/gource/package.nix b/pkgs/by-name/go/gource/package.nix
index 1e607fa64232..dbd58d2911c3 100644
--- a/pkgs/by-name/go/gource/package.nix
+++ b/pkgs/by-name/go/gource/package.nix
@@ -13,7 +13,7 @@
   glew,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   boost,
   glm,
   tinyxml,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     libGLU
     libGL
-    libX11
+    libx11
     boost
     glm
     freetype
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 66df5e3c6b95..7de5ff821643 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -18,11 +18,11 @@
   # optional deps for GUI packages
   guiSupport ? true,
   dbus-glib,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
-  libXext,
+  libx11,
+  libxt,
+  libxpm,
+  libxaw,
+  libxext,
   gobject-introspection,
   pango,
   gdk-pixbuf,
@@ -66,11 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
     atk
     dbus-glib
     gdk-pixbuf
-    libX11
-    libXaw
-    libXext
-    libXpm
-    libXt
+    libx11
+    libxaw
+    libxext
+    libxpm
+    libxt
     pango
   ];
 
diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index b8ef955e7427..2b43dcf66328 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -14,8 +14,8 @@
   libdrm,
   gpu-screen-recorder,
   libglvnd,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   wayland,
   wrapGAppsHook3,
   wrapperDir ? "/run/wrappers/bin",
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
     libayatana-appindicator
     libpulseaudio
     libdrm
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     wayland
   ];
 
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 4d294f23e875..efc7ff91bd6d 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -7,7 +7,7 @@
   ninja,
   addDriverRunpath,
   pkg-config,
-  libXcomposite,
+  libxcomposite,
   libpulseaudio,
   dbus,
   ffmpeg,
@@ -18,10 +18,10 @@
   libdrm,
   libva,
   libglvnd,
-  libXdamage,
-  libXi,
-  libXrandr,
-  libXfixes,
+  libxdamage,
+  libxi,
+  libxrandr,
+  libxfixes,
   wrapperDir ? "/run/wrappers/bin",
   gitUpdater,
 }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXcomposite
+    libxcomposite
     libpulseaudio
     dbus
     ffmpeg
@@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
     vulkan-headers
     libdrm
     libva
-    libXdamage
-    libXi
-    libXrandr
-    libXfixes
+    libxdamage
+    libxi
+    libxrandr
+    libxfixes
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index 75d1c5edd71f..1993c888667b 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -5,10 +5,10 @@
   pkg-config,
   fontconfig,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
   cmake,
   libxkbcommon,
   wayland,
@@ -37,10 +37,10 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     fontconfig
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     libxkbcommon
     wayland
   ];
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index 10cfc0cba3d5..adbcdf648be2 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -8,7 +8,7 @@
   freetype,
   ghostscript,
   graphviz,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libtiff,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     ghostscript
     graphviz
-    libX11
+    libx11
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix
index d9928a2354aa..5cffbb9c666b 100644
--- a/pkgs/by-name/gr/groff/package.nix
+++ b/pkgs/by-name/gr/groff/package.nix
@@ -6,10 +6,10 @@
   enableGhostscript ? false,
   ghostscript,
   gawk,
-  libX11,
-  libXaw,
-  libXt,
-  libXmu, # for postscript and html output
+  libx11,
+  libxaw,
+  libxt,
+  libxmu, # for postscript and html output
   enableHtml ? false,
   psutils,
   netpbm, # for html output
@@ -87,10 +87,10 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableGhostscript [
     ghostscript
     gawk
-    libX11
-    libXaw
-    libXt
-    libXmu
+    libx11
+    libxaw
+    libxt
+    libxmu
   ]
   ++ lib.optionals enableHtml [
     psutils
diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 32235dd82c6a..f1b48466b7a8 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -18,7 +18,7 @@
   libjxl,
   librsvg,
   libwebp,
-  libX11,
+  libx11,
   lcms2,
   bison,
   brasero,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     libtiff
     libwebp
-    libX11
+    libx11
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/gt/gtk2/package.nix b/pkgs/by-name/gt/gtk2/package.nix
index c8c62632c9ef..18db8a17783d 100644
--- a/pkgs/by-name/gt/gtk2/package.nix
+++ b/pkgs/by-name/gt/gtk2/package.nix
@@ -12,13 +12,13 @@
   gettext,
   glib,
   gobject-introspection,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   pango,
   perl,
   pkg-config,
@@ -89,16 +89,16 @@ stdenv.mkDerivation (finalAttrs: {
     pango
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [
-    libXcomposite
-    libXcursor
-    libXi
-    libXrandr
-    libXrender
+    libxcomposite
+    libxcursor
+    libxi
+    libxrandr
+    libxrender
   ]
-  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional xineramaSupport libxinerama
   ++ lib.optional cupsSupport cups
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libXdamage
+    libxdamage
   ];
 
   preConfigure = lib.optionalString (
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index ca89df1aa601..9bd5b6abb824 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -4,8 +4,8 @@
   fetchFromCodeberg,
   testers,
   cmake,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   sdbus-cpp,
   udev,
   libxcb-image,
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     cli11
     ddcutil
     fmt
-    libX11
-    libXext
+    libx11
+    libxext
     nlohmann_json
     sdbus-cpp
     spdlog
diff --git a/pkgs/by-name/gv/gv/package.nix b/pkgs/by-name/gv/gv/package.nix
index 5efb38dbda01..ba93f4ac7d45 100644
--- a/pkgs/by-name/gv/gv/package.nix
+++ b/pkgs/by-name/gv/gv/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libXext,
+  libxext,
   Xaw3d,
   ghostscriptX,
   perl,
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXext
+    libxext
     Xaw3d
     ghostscriptX
     perl
diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix
index e237516fda1b..367303383de2 100644
--- a/pkgs/by-name/gw/gwyddion/package.nix
+++ b/pkgs/by-name/gw/gwyddion/package.nix
@@ -15,7 +15,7 @@
   libxml2,
   libwebpSupport ? true,
   libwebp,
-  # libXmu is not used if libunique is.
+  # libxmu is not used if libunique is.
   libXmuSupport ? false,
   libxmu,
   libxsltSupport ? true,
diff --git a/pkgs/by-name/gx/gxemul/package.nix b/pkgs/by-name/gx/gxemul/package.nix
index 1ce5a012ad74..a7dca9bc284d 100644
--- a/pkgs/by-name/gx/gxemul/package.nix
+++ b/pkgs/by-name/gx/gxemul/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
   ];
 
   patches = [
diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix
index 6c2b87cf48f4..a53d96c0ff3e 100644
--- a/pkgs/by-name/ha/hackedbox/package.nix
+++ b/pkgs/by-name/ha/hackedbox/package.nix
@@ -6,13 +6,13 @@
   freetype,
   fribidi,
   imlib2,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
+  libxrender,
   pkg-config,
   xorgproto,
 }:
@@ -39,19 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fribidi
     imlib2
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
+    libxrender
     xorgproto
   ];
 
   configureFlags = [
-    "--x-includes=${libX11.dev}/include"
-    "--x-libraries=${libX11.out}/lib"
+    "--x-includes=${libx11.dev}/include"
+    "--x-libraries=${libx11.out}/lib"
   ];
 
   meta = {
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/museoa/hackedbox/";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix
index d28c1dd8dfff..358e27218788 100644
--- a/pkgs/by-name/ha/hardinfo2/package.nix
+++ b/pkgs/by-name/ha/hardinfo2/package.nix
@@ -25,8 +25,8 @@
   libsysprof-capture,
   libthai,
   libxkbcommon,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   pcre2,
   sqlite,
   util-linux,
@@ -100,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     sqlite
     util-linux
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     vulkan-headers
     wayland
   ];
diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix
index 44b9839975dc..b3abacbe9fb4 100644
--- a/pkgs/by-name/ha/hax11/package.nix
+++ b/pkgs/by-name/ha/hax11/package.nix
@@ -2,8 +2,8 @@
   lib,
   multiStdenv,
   fetchFromGitHub,
-  libX11,
-  libXxf86vm,
+  libx11,
+  libxxf86vm,
   xorgproto,
   unstableGitUpdater,
 }:
@@ -25,8 +25,8 @@ multiStdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXxf86vm
+    libx11
+    libxxf86vm
     xorgproto
   ];
 
diff --git a/pkgs/by-name/he/helix-gpt/package.nix b/pkgs/by-name/he/helix-gpt/package.nix
deleted file mode 100644
index f6c3f3eeb8da..000000000000
--- a/pkgs/by-name/he/helix-gpt/package.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  bun,
-  makeBinaryWrapper,
-}:
-let
-  pin = lib.importJSON ./pin.json;
-  src = fetchFromGitHub {
-    owner = "leona";
-    repo = "helix-gpt";
-    rev = pin.version;
-    hash = pin.srcHash;
-  };
-  node_modules = stdenv.mkDerivation {
-    pname = "helix-gpt-node_modules";
-    inherit src;
-    version = pin.version;
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-      "GIT_PROXY_COMMAND"
-      "SOCKS_SERVER"
-    ];
-    nativeBuildInputs = [ bun ];
-    dontConfigure = true;
-    buildPhase = ''
-      bun install --no-progress --frozen-lockfile
-    '';
-    installPhase = ''
-      mkdir -p $out/node_modules
-
-      cp -R ./node_modules $out
-    '';
-    outputHash = pin."${stdenv.system}";
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-  };
-in
-stdenv.mkDerivation {
-  pname = "helix-gpt";
-  version = pin.version;
-  inherit src;
-  nativeBuildInputs = [ makeBinaryWrapper ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-
-    ln -s ${node_modules}/node_modules $out
-    cp -R ./* $out
-
-    # bun is referenced naked in the package.json generated script
-    makeBinaryWrapper ${bun}/bin/bun $out/bin/helix-gpt \
-      --prefix PATH : ${lib.makeBinPath [ bun ]} \
-      --add-flags "run --prefer-offline --no-install --cwd $out ./src/app.ts"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://github.com/leona/helix-gpt";
-    changelog = "https://github.com/leona/helix-gpt/releases/tag/${src.rev}";
-    description = "Code completion LSP for Helix with support for Copilot + OpenAI";
-    mainProgram = "helix-gpt";
-    maintainers = with lib.maintainers; [ happysalada ];
-    license = with lib.licenses; [ mit ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-      "aarch64-linux"
-    ];
-  };
-}
diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json
deleted file mode 100644
index c9b18a14cee5..000000000000
--- a/pkgs/by-name/he/helix-gpt/pin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "version": "0.34",
-  "srcHash": "sha256-F2E+B4kKLpX4g/iCv0i71hSx4xdV6fdkwksslELdZUQ=",
-  "x86_64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw=",
-  "x86_64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
-  "aarch64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
-  "aarch64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw="
-}
diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix
index 9c74d9aacd1a..450058e2e44b 100644
--- a/pkgs/by-name/he/herbe/package.nix
+++ b/pkgs/by-name/he/herbe/package.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   freetype,
   patches ? [ ],
   extraLibs ? [ ],
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     freetype
   ]
   ++ extraLibs;
diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix
index b33d446464d6..202fef89c74c 100644
--- a/pkgs/by-name/he/herbstluftwm/package.nix
+++ b/pkgs/by-name/he/herbstluftwm/package.nix
@@ -5,14 +5,14 @@
   cmake,
   pkg-config,
   python3,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXft,
-  libXrender,
-  libXdmcp,
-  libXfixes,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxft,
+  libxrender,
+  libxdmcp,
+  libxfixes,
   freetype,
   asciidoc,
   xdotool,
@@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXinerama
-    libXrandr
-    libXft
-    libXrender
-    libXdmcp
-    libXfixes
+    libx11
+    libxext
+    libxinerama
+    libxrandr
+    libxft
+    libxrender
+    libxdmcp
+    libxfixes
     freetype
   ];
 
diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix
index 994250f2426a..79523e2ded29 100644
--- a/pkgs/by-name/hi/higan/package.nix
+++ b/pkgs/by-name/hi/higan/package.nix
@@ -7,8 +7,8 @@
   gtksourceview3,
   libGL,
   libGLU,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libicns,
   libpulseaudio,
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview3
     libGL
     libGLU
-    libX11
-    libXv
+    libx11
+    libxv
     libpulseaudio
     openal
     udev
diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix
index d65dfc7a81e2..8a6bcb591d60 100644
--- a/pkgs/by-name/hi/highlight-pointer/package.nix
+++ b/pkgs/by-name/hi/highlight-pointer/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxi,
   libxfixes,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     libxi
     libxfixes
   ];
diff --git a/pkgs/by-name/hi/highscore-desmume/package.nix b/pkgs/by-name/hi/highscore-desmume/package.nix
index 1ab7b2d51d1b..cb0450113577 100644
--- a/pkgs/by-name/hi/highscore-desmume/package.nix
+++ b/pkgs/by-name/hi/highscore-desmume/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   libhighscore,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   libpcap,
   unstableGitUpdater,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libhighscore
     libGL
-    libX11
+    libx11
     SDL2
     libpcap
   ];
diff --git a/pkgs/by-name/hi/hime/package.nix b/pkgs/by-name/hi/hime/package.nix
index 82e5f2e999db..adc4e2d01a51 100644
--- a/pkgs/by-name/hi/hime/package.nix
+++ b/pkgs/by-name/hi/hime/package.nix
@@ -6,7 +6,7 @@
   gtk2,
   gtk3,
   qt5,
-  libXtst,
+  libxtst,
   lib,
   libchewing,
   unixtools,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     unixtools.whereis
   ];
   buildInputs = [
-    libXtst
+    libxtst
     gtk2
     gtk3
     qt5.qtbase
diff --git a/pkgs/by-name/hs/hsetroot/package.nix b/pkgs/by-name/hs/hsetroot/package.nix
index 1c24340c9d6e..b16fd3225385 100644
--- a/pkgs/by-name/hs/hsetroot/package.nix
+++ b/pkgs/by-name/hs/hsetroot/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   imlib2,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   postPatch = lib.optionalString (!stdenv.cc.isGNU) ''
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index 776493e07b5a..d1a490cc76c9 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -4,20 +4,20 @@
   fetchurl,
   unzip,
   makeWrapper,
-  libX11,
+  libx11,
   zlib,
   libsm,
   libice,
-  libXext,
+  libxext,
   freetype,
-  libXrender,
+  libxrender,
   fontconfig,
-  libXft,
-  libXinerama,
-  libXcursor,
+  libxft,
+  libxinerama,
+  libxcursor,
   cairo,
-  libXfixes,
-  libXScrnSaver,
+  libxfixes,
+  libxscrnsaver,
   libnotify,
   glib,
   gtk3,
@@ -36,25 +36,25 @@ let
   sha256 = "sha256:0cv6b5rx1bjizwa22xlzmljwgcvm1mqyng79qqrdzmd0xy7c02pi";
 
   rpath = lib.makeLibraryPath [
-    libX11
+    libx11
     zlib
     libsm
     libice
-    libXext
+    libxext
     freetype
-    libXrender
+    libxrender
     fontconfig
-    libXft
-    libXinerama
+    libxft
+    libxinerama
     stdenv.cc.cc
     libnotify
     glib
     gtk3
     libappindicator-gtk3
     curl
-    libXfixes
-    libXScrnSaver
-    libXcursor
+    libxfixes
+    libxscrnsaver
+    libxcursor
     cairo
   ];
 
diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix
index 4b658c31aef3..053b9c7f8f83 100644
--- a/pkgs/by-name/hu/hugin/package.nix
+++ b/pkgs/by-name/hu/hugin/package.nix
@@ -19,9 +19,9 @@
   libjpeg,
   libpng,
   libtiff,
-  libX11,
-  libXi,
-  libXmu,
+  libx11,
+  libxi,
+  libxmu,
   libGLU,
   libGL,
   openexr,
@@ -57,9 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libtiff
-    libX11
-    libXi
-    libXmu
+    libx11
+    libxi
+    libxmu
     libGLU
     libGL
     openexr
diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix
index 602b0a5d2a5e..9aad772e8f49 100644
--- a/pkgs/by-name/hw/hwloc/package.nix
+++ b/pkgs/by-name/hw/hwloc/package.nix
@@ -9,7 +9,7 @@
   pciutils,
   numactl,
   x11Support ? false,
-  libX11,
+  libx11,
   cairo,
   config,
   enableCuda ? config.cudaSupport,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-netloc"
   ];
 
-  # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
+  # XXX: libx11 is not directly needed, but needed as a propagated dep of Cairo.
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals x11Support [
     cairo
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
   ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
diff --git a/pkgs/by-name/hy/hybridreverb2/package.nix b/pkgs/by-name/hy/hybridreverb2/package.nix
index 20eb1f6fe840..af49089fd471 100644
--- a/pkgs/by-name/hy/hybridreverb2/package.nix
+++ b/pkgs/by-name/hy/hybridreverb2/package.nix
@@ -8,11 +8,11 @@
   alsa-lib,
   libjack2,
   freetype,
-  libX11,
+  libx11,
   gtk3,
   pcre,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libepoxy,
   at-spi2-core,
@@ -56,11 +56,11 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     freetype
-    libX11
+    libx11
     gtk3
     pcre
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libepoxy
     at-spi2-core
diff --git a/pkgs/by-name/hy/hyper/package.nix b/pkgs/by-name/hy/hyper/package.nix
index 18e5a4999363..bc8b874c38d9 100644
--- a/pkgs/by-name/hy/hyper/package.nix
+++ b/pkgs/by-name/hy/hyper/package.nix
@@ -12,17 +12,17 @@
   freetype,
   fontconfig,
   dbus,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libX11,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libx11,
+  libxtst,
+  libxscrnsaver,
   libxcb,
   nss,
   nspr,
@@ -52,18 +52,18 @@ let
     freetype
     fontconfig
     dbus
-    libXi
-    libXcursor
-    libXdamage
-    libXrandr
-    libXcomposite
-    libXext
-    libXfixes
+    libxi
+    libxcursor
+    libxdamage
+    libxrandr
+    libxcomposite
+    libxext
+    libxfixes
     libxcb
-    libXrender
-    libX11
-    libXtst
-    libXScrnSaver
+    libxrender
+    libx11
+    libxtst
+    libxscrnsaver
     nss
     nspr
     alsa-lib
diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix
index 4a2676384e38..c79a762cdc8a 100644
--- a/pkgs/by-name/hy/hyperspeedcube/package.nix
+++ b/pkgs/by-name/hy/hyperspeedcube/package.nix
@@ -14,12 +14,12 @@
   harfbuzz,
   lib,
   libGL,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXi,
+  libxcursor,
+  libxi,
   libxkbcommon,
-  libXrandr,
+  libxrandr,
   makeWrapper,
   mold,
   pango,
@@ -86,10 +86,10 @@ rustPlatform.buildRustPackage rec {
     wayland
 
     # WINIT_UNIX_BACKEND=x11
-    libXcursor
-    libXrandr
-    libXi
-    libX11
+    libxcursor
+    libxrandr
+    libxi
+    libx11
 
     vulkan-headers
     vulkan-loader
diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix
index e640542cd6d1..147def6b9ac3 100644
--- a/pkgs/by-name/hy/hyprpicker/package.nix
+++ b/pkgs/by-name/hy/hyprpicker/package.nix
@@ -15,7 +15,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXdmcp,
+  libxdmcp,
   debug ? false,
 }:
 gcc15Stdenv.mkDerivation (finalAttrs: {
@@ -47,7 +47,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wayland-scanner
-    libXdmcp
+    libxdmcp
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix
index b4756ca76dc1..7c6dd89229c0 100644
--- a/pkgs/by-name/hy/hypseus-singe/package.nix
+++ b/pkgs/by-name/hy/hypseus-singe/package.nix
@@ -15,7 +15,7 @@
   libmpeg2,
   libvorbis,
   libzip,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libzip
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/ic/icbm3d/package.nix b/pkgs/by-name/ic/icbm3d/package.nix
index 270e57c3045d..26e2c53d517f 100644
--- a/pkgs/by-name/ic/icbm3d/package.nix
+++ b/pkgs/by-name/ic/icbm3d/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mtQcFU70dpV3GiaHXVQVvO3LE5NSseIXXzhtIGsAOP0=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix darwin and cross-compiled builds
 
diff --git a/pkgs/by-name/ic/icesl/package.nix b/pkgs/by-name/ic/icesl/package.nix
index a3a1bfae3d96..b319368f0247 100644
--- a/pkgs/by-name/ic/icesl/package.nix
+++ b/pkgs/by-name/ic/icesl/package.nix
@@ -3,14 +3,14 @@
   lib,
   fetchzip,
   libglut,
-  libXmu,
-  libXi,
-  libX11,
+  libxmu,
+  libxi,
+  libx11,
   libice,
   libGLU,
   libGL,
   libsm,
-  libXext,
+  libxext,
   glibc,
   lua,
   luabind,
@@ -21,15 +21,15 @@
 }:
 let
   lpath = lib.makeLibraryPath [
-    libXmu
-    libXi
-    libX11
+    libxmu
+    libxi
+    libx11
     libglut
     libice
     libGLU
     libGL
     libsm
-    libXext
+    libxext
     glibc
     lua
     glfw
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index bfa10432754d..99793c5c76c7 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -16,16 +16,16 @@
   imlib2,
   libice,
   libsm,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
   libjpeg,
   libogg,
   libpng,
@@ -73,16 +73,16 @@ gccStdenv.mkDerivation (finalAttrs: {
     imlib2
     libice
     libsm
-    libX11
-    libXcomposite
-    libXdamage
-    libXdmcp
-    libXext
-    libXfixes
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
+    libx11
+    libxcomposite
+    libxdamage
+    libxdmcp
+    libxext
+    libxfixes
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
     libjpeg
     libogg
     libpng
diff --git a/pkgs/by-name/ic/ico/package.nix b/pkgs/by-name/ic/ico/package.nix
index ad1f3cd95c88..50c55c513238 100644
--- a/pkgs/by-name/ic/ico/package.nix
+++ b/pkgs/by-name/ic/ico/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
   writeScript,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/ic/icon-lang/package.nix b/pkgs/by-name/ic/icon-lang/package.nix
index d3a351d2afcc..97fb6773e4d9 100644
--- a/pkgs/by-name/ic/icon-lang/package.nix
+++ b/pkgs/by-name/ic/icon-lang/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   withGraphics ? true,
 }:
 
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = lib.optionals withGraphics [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   configurePhase =
diff --git a/pkgs/by-name/ic/icon-slicer/package.nix b/pkgs/by-name/ic/icon-slicer/package.nix
index 34d08cce01f7..30ca2802cf14 100644
--- a/pkgs/by-name/ic/icon-slicer/package.nix
+++ b/pkgs/by-name/ic/icon-slicer/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ gdk-pixbuf ];
 
   meta = {
-    description = "Utility for generating icon themes and libXcursor cursor themes";
+    description = "Utility for generating icon themes and libxcursor cursor themes";
     homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ zaninime ];
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 087d701ea053..f99e76615b63 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -14,7 +14,7 @@
   libpsl,
   libsForQt5,
   libredirect,
-  libX11,
+  libx11,
   lz4,
   makeDesktopItem,
   makeWrapper,
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/ideamaker \
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
       --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
-      --set QTCOMPOSE "${libX11.out}/share/X11/locale" \
+      --set QTCOMPOSE "${libx11.out}/share/X11/locale" \
       --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
       --set NIX_REDIRECTS /usr/share=$out/share/
   '';
diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix
index 7a1de6869e9d..28122b98239f 100644
--- a/pkgs/by-name/im/imagemagick/package.nix
+++ b/pkgs/by-name/im/imagemagick/package.nix
@@ -9,9 +9,9 @@
   zlibSupport ? true,
   zlib,
   libX11Support ? !stdenv.hostPlatform.isMinGW,
-  libX11,
+  libx11,
   libXtSupport ? !stdenv.hostPlatform.isMinGW,
-  libXt,
+  libxt,
   fontconfigSupport ? true,
   fontconfig,
   freetypeSupport ? true,
@@ -159,8 +159,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional freetypeSupport freetype
   ++ lib.optional libjpegSupport libjpeg
   ++ lib.optional lcms2Support lcms2
-  ++ lib.optional libX11Support libX11
-  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libX11Support libx11
+  ++ lib.optional libXtSupport libxt
   ++ lib.optional libwebpSupport libwebp
   ++ lib.optional fftwSupport fftw;
 
diff --git a/pkgs/by-name/im/imagemagick6/package.nix b/pkgs/by-name/im/imagemagick6/package.nix
index 6721d21baa54..539291870208 100644
--- a/pkgs/by-name/im/imagemagick6/package.nix
+++ b/pkgs/by-name/im/imagemagick6/package.nix
@@ -9,9 +9,9 @@
   zlibSupport ? true,
   zlib,
   libX11Support ? !stdenv.hostPlatform.isMinGW,
-  libX11,
+  libx11,
   libXtSupport ? !stdenv.hostPlatform.isMinGW,
-  libXt,
+  libxt,
   fontconfigSupport ? true,
   fontconfig,
   freetypeSupport ? true,
@@ -130,8 +130,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional freetypeSupport freetype
   ++ lib.optional libjpegSupport libjpeg
   ++ lib.optional lcms2Support lcms2
-  ++ lib.optional libX11Support libX11
-  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libX11Support libx11
+  ++ lib.optional libXtSupport libxt
   ++ lib.optional libwebpSupport libwebp;
 
   doCheck = false; # fails 2 out of 76 tests
diff --git a/pkgs/by-name/im/imwheel/package.nix b/pkgs/by-name/im/imwheel/package.nix
index 4ef9ffbfb422..a7d0d803d7ca 100644
--- a/pkgs/by-name/im/imwheel/package.nix
+++ b/pkgs/by-name/im/imwheel/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
+  libxt,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXi
-    libXmu
-    libXt
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxmu
+    libxt
+    libxtst
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index 23d0fc4498db..483fdaddfd72 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -7,8 +7,8 @@
   cmake,
   lv2,
   libpthread-stubs,
-  libXdmcp,
-  libXft,
+  libxdmcp,
+  libxft,
   ntk,
   pcre,
   fftwFloat,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     cairomm
     lv2
     libpthread-stubs
-    libXdmcp
-    libXft
+    libxdmcp
+    libxft
     ntk
     pcre
     fftwFloat
diff --git a/pkgs/by-name/in/input-leap/package.nix b/pkgs/by-name/in/input-leap/package.nix
index 1432e0a04cc2..b34f38cce804 100644
--- a/pkgs/by-name/in/input-leap/package.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -6,12 +6,12 @@
   curl,
   libice,
   libsm,
-  libX11,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libei,
   libportal,
   openssl,
@@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     qt6.qtbase
     avahi'
-    libX11
-    libXext
-    libXtst
-    libXinerama
-    libXrandr
-    libXdmcp
+    libx11
+    libxext
+    libxtst
+    libxinerama
+    libxrandr
+    libxdmcp
     libice
     libsm
   ]
diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 7ee4a89e01c0..404cbdc30ff2 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -27,10 +27,10 @@
   liboping,
   libpciaccess,
   libunwind,
-  libX11,
-  libXext,
-  libXrandr,
-  libXv,
+  libx11,
+  libxext,
+  libxrandr,
+  libxv,
   openssl,
   peg,
   procps,
@@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
     liboping
     libpciaccess
     libunwind
-    libX11
-    libXext
-    libXrandr
-    libXv
+    libx11
+    libxext
+    libxrandr
+    libxv
     openssl
     peg
     procps
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index c56d7df90fec..3a6d74444ec8 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -10,7 +10,7 @@
   intel-gmmlib,
   libdrm,
   enableX11 ? stdenv.hostPlatform.isLinux,
-  libX11,
+  libx11,
   # for passhtru.tests
   pkgsi686Linux,
 }:
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     intel-gmmlib
     libdrm
   ]
-  ++ lib.optional enableX11 libX11;
+  ++ lib.optional enableX11 libx11;
 
   postFixup = lib.optionalString enableX11 ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libx11 ]}" \
       $out/lib/dri/iHD_drv_video.so
   '';
 
diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix
index ed5d7f982ea6..18509b93aa2d 100644
--- a/pkgs/by-name/in/intel-media-sdk/package.nix
+++ b/pkgs/by-name/in/intel-media-sdk/package.nix
@@ -8,9 +8,9 @@
   libdrm,
   libpciaccess,
   libva,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libpthread-stubs,
   fetchpatch,
 }:
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
     libdrm
     libva
     libpciaccess
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libpthread-stubs
   ];
   nativeCheckInputs = [ gtest ];
diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix
index 748a36fb5ddc..b461933e2d85 100644
--- a/pkgs/by-name/in/intel-vaapi-driver/package.nix
+++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix
@@ -10,10 +10,10 @@
   intel-gpu-tools,
   libdrm,
   libva,
-  libX11,
+  libx11,
   libGL,
   wayland,
-  libXext,
+  libxext,
   enableHybridCodec ? false,
   vaapi-intel-hybrid,
   enableGui ? true,
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
     libva
   ]
   ++ lib.optionals enableGui [
-    libX11
-    libXext
+    libx11
+    libxext
     libGL
     wayland
   ]
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 1bce2be773cb..8155d0e95f6c 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -30,7 +30,7 @@
   glfw,
   pkg-config,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libmemcached,
 }:
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
     glfw
     openssl
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libmemcached
     python3
   ];
diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index cbb5a65e8b50..5883d16b1bac 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -15,7 +15,7 @@
   libpulseaudio,
   libusb-compat-0_1,
   libvorbis,
-  libXtst,
+  libxtst,
   udev,
   makeWrapper,
   makeDesktopItem,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libusb-compat-0_1
     libvorbis
-    libXtst
+    libxtst
     udev
   ];
 
diff --git a/pkgs/by-name/ja/jaaa/package.nix b/pkgs/by-name/ja/jaaa/package.nix
index b2364cda5418..75f06338142d 100644
--- a/pkgs/by-name/ja/jaaa/package.nix
+++ b/pkgs/by-name/ja/jaaa/package.nix
@@ -5,9 +5,9 @@
   alsa-lib,
   libclthreads,
   libclxclient,
-  libX11,
-  libXft,
-  libXrender,
+  libx11,
+  libxft,
+  libxrender,
   fftwFloat,
   libjack2,
   zita-alsa-pcmi,
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     alsa-lib
     libclthreads
     libclxclient
-    libX11
-    libXft
-    libXrender
+    libx11
+    libxft
+    libxrender
     fftwFloat
     libjack2
     zita-alsa-pcmi
diff --git a/pkgs/by-name/ja/jack_oscrolloscope/package.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix
index 19109b1e21aa..f5ed0a899b76 100644
--- a/pkgs/by-name/ja/jack_oscrolloscope/package.nix
+++ b/pkgs/by-name/ja/jack_oscrolloscope/package.nix
@@ -6,7 +6,7 @@
   libjack2,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   pkg-config,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libjack2
     libGLU
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index b32d1573ac61..e41386949f13 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -11,7 +11,7 @@
   jre,
   gtk3,
   glib,
-  libXtst,
+  libxtst,
 }:
 
 let
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     gtk3
     glib
-    libXtst
+    libxtst
   ];
 
   dontWrapGApps = true;
diff --git a/pkgs/by-name/ja/japa/package.nix b/pkgs/by-name/ja/japa/package.nix
index 2bc752b7d51f..cf173725a08d 100644
--- a/pkgs/by-name/ja/japa/package.nix
+++ b/pkgs/by-name/ja/japa/package.nix
@@ -7,8 +7,8 @@
   fftwFloat,
   libclthreads,
   libclxclient,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   zita-alsa-pcmi,
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
     fftwFloat
     libclthreads
     libclxclient
-    libX11
-    libXft
+    libx11
+    libxft
     zita-alsa-pcmi
   ];
 
diff --git a/pkgs/by-name/je/jed/package.nix b/pkgs/by-name/je/jed/package.nix
index bb04f21a1131..91ee3fc4c605 100644
--- a/pkgs/by-name/je/jed/package.nix
+++ b/pkgs/by-name/je/jed/package.nix
@@ -4,9 +4,9 @@
   fetchzip,
   pkg-config,
   gpm,
-  libXext,
-  libXft,
-  libXt,
+  libxext,
+  libxft,
+  libxt,
   ncurses5,
   slang,
 }:
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gpm
-    libXext
-    libXft
-    libXt
+    libxext
+    libxft
+    libxt
     ncurses5
     slang
   ];
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index c34485efbfa0..dde44cd63630 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -7,9 +7,9 @@
   makeDesktopItem,
   makeWrapper,
   libpng,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   zlib,
   electron,
 }:
@@ -35,9 +35,9 @@ buildNpmPackage rec {
   # robotjs node-gyp dependencies
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpng
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     zlib
   ];
 
diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix
index aec05a600f8b..882672bbc36b 100644
--- a/pkgs/by-name/jo/josm/package.nix
+++ b/pkgs/by-name/jo/josm/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   unzip,
   jre,
-  libXxf86vm,
+  libxxf86vm,
   extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true",
 }:
 let
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
         # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
         makeWrapper ${jre}/bin/java $out/bin/josm \
           --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \
-          --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \
+          --prefix LD_LIBRARY_PATH ":" '${libxxf86vm}/lib' \
           --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \
           --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
       '';
diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix
index f57300ec78f8..71c8986e3be7 100644
--- a/pkgs/by-name/ju/juce/package.nix
+++ b/pkgs/by-name/ju/juce/package.nix
@@ -21,11 +21,11 @@
   libsepol,
   libthai,
   libdatrie,
-  libXdmcp,
+  libxdmcp,
   lerc,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   sqlite,
   fontconfig,
   versionCheckHook,
@@ -74,9 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
     util-linuxMinimal
     libselinux
     libsepol
-    libXdmcp
+    libxdmcp
     libxkbcommon
-    libXtst
+    libxtst
   ];
 
   propagatedBuildInputs = [ fontconfig ];
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index efc1a874b18e..0bbbedbb38c4 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.37.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KN8hukahS+/RowmQoaUrfxCKFT9YUhaIXzh84cBV1Ck=";
+    hash = "sha256-FXbQyKmh/CG/TsRi9yq9L8bVbQ39u6PRLZIet3d/bjA=";
   };
 
-  cargoHash = "sha256-rk3Qft9g67rG0m6rPd4d++wDM5RiRrJAIHdUOQhn9bg=";
+  cargoHash = "sha256-VvgGnAPCvcBmbP2Aw7tdJcjfo+011u4Pqx1pKiiWISA=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ka/kafka-cmak/package.nix b/pkgs/by-name/ka/kafka-cmak/package.nix
index 04dd46debff8..073e9f5794ae 100644
--- a/pkgs/by-name/ka/kafka-cmak/package.nix
+++ b/pkgs/by-name/ka/kafka-cmak/package.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  name = "CMAK";
+  pname = "kafka-cmak";
   version = "3.0.0.6";
 
   src = fetchzip {
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 285f5bbd9e11..333d90f3fa09 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -15,9 +15,9 @@
   makeDesktopItem,
 
   libxkbcommon,
-  libX11,
-  libXtst,
-  libXi,
+  libx11,
+  libxtst,
+  libxi,
   wayland,
 }:
 
@@ -53,9 +53,9 @@ buildNpmPackage.override { inherit nodejs; } rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxkbcommon
-    libX11
-    libXtst
-    libXi
+    libx11
+    libxtst
+    libxi
     wayland
   ];
 
diff --git a/pkgs/by-name/ka/katawa-shoujo/package.nix b/pkgs/by-name/ka/katawa-shoujo/package.nix
index 289896146572..f89a73117923 100644
--- a/pkgs/by-name/ka/katawa-shoujo/package.nix
+++ b/pkgs/by-name/ka/katawa-shoujo/package.nix
@@ -15,10 +15,10 @@
   devendorImageLibs ? !stdenvNoCC.hostPlatform.isDarwin,
   libjpeg,
   libpng12,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
   runtimeShell,
   SDL_compat,
   SDL_image,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
     libpng12
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXi
-    libXmu
+    libx11
+    libxext
+    libxi
+    libxmu
     libGL
     libGLU
   ];
diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix
index 280a856daa0e..f11363f8db67 100644
--- a/pkgs/by-name/ka/katriawm/package.nix
+++ b/pkgs/by-name/ka/katriawm/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXft,
-  libXrandr,
+  libx11,
+  libxft,
+  libxrandr,
   pkg-config,
   gitUpdater,
 }:
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrandr
+    libx11
+    libxft
+    libxrandr
   ];
 
   outputs = [
@@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "katriawm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/kd/kdocker/package.nix b/pkgs/by-name/kd/kdocker/package.nix
index 7882e270c90b..502f3cc50adb 100644
--- a/pkgs/by-name/kd/kdocker/package.nix
+++ b/pkgs/by-name/kd/kdocker/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   libxcb,
   perl, # For pod2man
   qt6,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     qt6.qtbase
   ];
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 7e839cfc5d01..3f6e3e6e7d1a 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -10,8 +10,8 @@
   botan3,
   curl,
   darwinMinVersionHook,
-  libXi,
-  libXtst,
+  libxi,
+  libxtst,
   libargon2,
   libusb1,
   minizip,
@@ -140,8 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     botan3
     curl
-    libXi
-    libXtst
+    libxi
+    libxtst
     libargon2
     libsForQt5.qtbase
     libsForQt5.qtsvg
diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 5cea9880f834..50229cc3c924 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -19,12 +19,12 @@
   libsecret,
   libappindicator,
   xdotool,
-  libX11,
-  libXcomposite,
-  libXext,
-  libXrandr,
-  libXScrnSaver,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxext,
+  libxrandr,
+  libxscrnsaver,
+  libxtst,
   libxshmfence,
 }:
 let
@@ -55,12 +55,12 @@ let
     libGL
     nss
     udev
-    libX11
-    libXcomposite
-    libXext
-    libXrandr
-    libXScrnSaver
-    libXtst
+    libx11
+    libxcomposite
+    libxext
+    libxrandr
+    libxscrnsaver
+    libxtst
     libxshmfence
     gnome-keyring
     libgbm
diff --git a/pkgs/by-name/ke/keybinder3/package.nix b/pkgs/by-name/ke/keybinder3/package.nix
index 085e678931cf..e115f8c57398 100644
--- a/pkgs/by-name/ke/keybinder3/package.nix
+++ b/pkgs/by-name/ke/keybinder3/package.nix
@@ -11,9 +11,9 @@
   gtk3,
   gtk3-x11,
   gtk3' ? (if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3),
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   gobject-introspection,
 }:
 
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk3'
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index affd683a2b1a..763d6c23fb2e 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -5,8 +5,8 @@
   gradle_9,
   jdk21,
   fontconfig,
-  libXinerama,
-  libXrandr,
+  libxinerama,
+  libxrandr,
   file,
   gtk3,
   glib,
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libXinerama
-    libXrandr
+    libxinerama
+    libxrandr
     file
     gtk3
     glib
diff --git a/pkgs/by-name/ke/keyleds/package.nix b/pkgs/by-name/ke/keyleds/package.nix
index f29637f71734..f330f549b258 100644
--- a/pkgs/by-name/ke/keyleds/package.nix
+++ b/pkgs/by-name/ke/keyleds/package.nix
@@ -6,8 +6,8 @@
   cmake,
   pkg-config,
   libuv,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libyaml,
   luajit,
   udev,
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libuv
-    libX11
-    libXi
+    libx11
+    libxi
     libyaml
     luajit
     udev
diff --git a/pkgs/by-name/ke/keym/package.nix b/pkgs/by-name/ke/keym/package.nix
index c6cb1835755d..4e9c12b4b39f 100644
--- a/pkgs/by-name/ke/keym/package.nix
+++ b/pkgs/by-name/ke/keym/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
-  libXi,
+  libx11,
+  libxtst,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXtst
-    libXi
+    libx11
+    libxtst
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index 6db4e03ef204..3038e31e864b 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   dbus,
-  libX11,
+  libx11,
   libusb1,
   pkg-config,
   udev,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     wayland
     wayland-scanner
-    libX11
+    libx11
     udev
     libusb1
     libxkbcommon
diff --git a/pkgs/by-name/ke/keynav/package.nix b/pkgs/by-name/ke/keynav/package.nix
index 200419bd2b18..568698e78b43 100644
--- a/pkgs/by-name/ke/keynav/package.nix
+++ b/pkgs/by-name/ke/keynav/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
-  libXtst,
-  libXi,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxtst,
+  libxi,
+  libxext,
+  libxinerama,
+  libxrandr,
   glib,
   cairo,
   xdotool,
@@ -31,13 +31,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXtst
-    libXi
-    libXext
-    libXinerama
-    libXrandr
+    libxtst
+    libxi
+    libxext
+    libxinerama
+    libxrandr
     glib
     cairo
     xdotool
diff --git a/pkgs/by-name/ke/keyspersecond/package.nix b/pkgs/by-name/ke/keyspersecond/package.nix
index 940760e086aa..4651eea230af 100644
--- a/pkgs/by-name/ke/keyspersecond/package.nix
+++ b/pkgs/by-name/ke/keyspersecond/package.nix
@@ -8,12 +8,12 @@
   makeWrapper,
   jre,
   libGL,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libxkbcommon,
   libxcb,
-  libXt,
-  libXinerama,
+  libxt,
+  libxinerama,
 }:
 
 let
@@ -23,12 +23,12 @@ let
     # used by the Java2D OpenGL backend
     libGL
     # jnativehook dependencies
-    libX11
-    libXtst
+    libx11
+    libxtst
     libxkbcommon
     libxcb
-    libXt
-    libXinerama
+    libxt
+    libxinerama
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix
index 3dcee6002355..ebc51c125c9c 100644
--- a/pkgs/by-name/ki/kicad/base.nix
+++ b/pkgs/by-name/ki/kicad/base.nix
@@ -7,7 +7,7 @@
   zlib,
   wxGTK,
   gtk3,
-  libX11,
+  libx11,
   gettext,
   glew,
   glm,
@@ -19,7 +19,7 @@
   doxygen,
   graphviz,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   unixODBC,
   libgit2,
   libsecret,
@@ -37,7 +37,7 @@
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   pcre2,
   libdeflate,
 
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
     pcre2
   ];
 
@@ -157,10 +157,10 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     zlib
-    libX11
+    libx11
     wxGTK
     gtk3
-    libXdmcp
+    libxdmcp
     gettext
     glew
     glm
diff --git a/pkgs/by-name/ki/kisslicer/package.nix b/pkgs/by-name/ki/kisslicer/package.nix
index 23cf751efb42..23c714442b44 100644
--- a/pkgs/by-name/ki/kisslicer/package.nix
+++ b/pkgs/by-name/ki/kisslicer/package.nix
@@ -1,6 +1,6 @@
 {
   fetchzip,
-  libX11,
+  libx11,
   libGLU,
   libGL,
   makeWrapper,
@@ -14,7 +14,7 @@ let
     libGLU
     libGL
     stdenv.cc.cc
-    libX11
+    libx11
   ];
 
   inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index d5d1425396a8..9cd9d0ed1757 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -11,13 +11,13 @@
   imagemagick,
   libstartup_notification,
   libGL,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   libxkbcommon,
-  libXi,
-  libXext,
+  libxi,
+  libxext,
   wayland-protocols,
   wayland,
   xxHash,
@@ -87,13 +87,13 @@ buildPythonApplication rec {
     fontconfig
     libunistring
     libcanberra
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     libxkbcommon
-    libXi
-    libXext
+    libxi
+    libxext
     wayland-protocols
     wayland
     dbus
diff --git a/pkgs/by-name/kl/klassy/package.nix b/pkgs/by-name/kl/klassy/package.nix
index 2cff91c1a4d5..9dd723c02331 100644
--- a/pkgs/by-name/kl/klassy/package.nix
+++ b/pkgs/by-name/kl/klassy/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "klassy";
-  version = "6.4.breeze6.4.0";
+  version = "6.5";
 
   src = fetchFromGitHub {
     owner = "paulmcauley";
     repo = "klassy";
-    tag = finalAttrs.version;
-    hash = "sha256-+bYS2Upr84BS0IdA0HlCK0FF05yIMVbRvB8jlN5EOUM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zf+RO+GolA9Gnf1/izIG7jCSu8Qlo0d0kRc90llMRIc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/km/kmscube/package.nix b/pkgs/by-name/km/kmscube/package.nix
index 4448040458c2..30cdae1ff66c 100644
--- a/pkgs/by-name/km/kmscube/package.nix
+++ b/pkgs/by-name/km/kmscube/package.nix
@@ -5,7 +5,7 @@
   meson,
   ninja,
   libdrm,
-  libX11,
+  libx11,
   libGL,
   libgbm,
   pkg-config,
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     libdrm
-    libX11
+    libx11
     libGL
     libgbm
   ]
diff --git a/pkgs/by-name/ko/kodelife/package.nix b/pkgs/by-name/ko/kodelife/package.nix
index 28f583e53c1b..aea9552ba359 100644
--- a/pkgs/by-name/ko/kodelife/package.nix
+++ b/pkgs/by-name/ko/kodelife/package.nix
@@ -10,14 +10,14 @@
   avahi,
   gst_all_1,
   libxcb,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxxf86vm,
   libglvnd,
   zenity,
 }:
@@ -27,14 +27,14 @@ let
     curl
     avahi
     libxcb
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxxf86vm
     libglvnd
   ];
 
diff --git a/pkgs/by-name/ko/koules/package.nix b/pkgs/by-name/ko/koules/package.nix
index 8ab67925116b..f289b63cbe45 100644
--- a/pkgs/by-name/ko/koules/package.nix
+++ b/pkgs/by-name/ko/koules/package.nix
@@ -7,8 +7,8 @@
   gccmakedep,
   imake,
   installShellFiles,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   makeDesktopItem,
 }:
 
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   # Debian maintains lots of patches for koules. Let's include all of them.
diff --git a/pkgs/by-name/ks/ksuperkey/package.nix b/pkgs/by-name/ks/ksuperkey/package.nix
index f5355613147b..528385678b4f 100644
--- a/pkgs/by-name/ks/ksuperkey/package.nix
+++ b/pkgs/by-name/ks/ksuperkey/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   pkg-config,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 411bbf927419..6e56d69abb23 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -9,7 +9,7 @@
   harfbuzz,
   libogg,
   libwebp,
-  libX11,
+  libx11,
   mpg123,
   opusfile,
   SDL2,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libogg
     libwebp
-    libX11
+    libx11
     mpg123
     opusfile
     SDL2
diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index cbc18165f481..97acca9f355b 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -6,8 +6,8 @@
   glib,
   gtk4,
   libadwaita,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   pkg-config,
   wrapGAppsHook4,
 }:
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec {
     glib
     gtk4
     libadwaita
-    libX11
-    libXtst
+    libx11
+    libxtst
   ];
 
   cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM=";
diff --git a/pkgs/by-name/la/larswm/package.nix b/pkgs/by-name/la/larswm/package.nix
index dd931bcd187b..73948297e8f5 100644
--- a/pkgs/by-name/la/larswm/package.nix
+++ b/pkgs/by-name/la/larswm/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
-  libXmu,
+  libx11,
+  libxext,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXmu
+    libx11
+    libxext
+    libxmu
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/lc/lcdproc/package.nix b/pkgs/by-name/lc/lcdproc/package.nix
index 05b27dca1f42..306126129217 100644
--- a/pkgs/by-name/lc/lcdproc/package.nix
+++ b/pkgs/by-name/lc/lcdproc/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   doxygen,
   freetype,
-  libX11,
+  libx11,
   libftdi,
   libusb-compat-0_1,
   libusb1,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     freetype
-    libX11
+    libx11
     libftdi
     libusb-compat-0_1
     libusb1
diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix
index bd1a16e573d5..92e9fb6bd7c7 100644
--- a/pkgs/by-name/le/leftwm/package.nix
+++ b/pkgs/by-name/le/leftwm/package.nix
@@ -2,14 +2,14 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 let
   rpathLibs = [
-    libXinerama
-    libX11
+    libxinerama
+    libx11
   ];
 in
 
diff --git a/pkgs/by-name/le/lesbar/package.nix b/pkgs/by-name/le/lesbar/package.nix
index 9fe4547fcc35..89ea84e41098 100644
--- a/pkgs/by-name/le/lesbar/package.nix
+++ b/pkgs/by-name/le/lesbar/package.nix
@@ -4,7 +4,7 @@
   fetchFromSourcehut,
   pkg-config,
   scdoc,
-  libX11,
+  libx11,
   cairo,
   pango,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     cairo
     pango
   ];
diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix
index 990d06a0e75d..8d5fb0023923 100644
--- a/pkgs/by-name/li/libagar/package.nix
+++ b/pkgs/by-name/li/libagar/package.nix
@@ -10,7 +10,7 @@
   mandoc,
   libpng,
   libjpeg,
-  libXinerama,
+  libxinerama,
   freetype,
   SDL,
   libGL,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bsdbuild
     perl
-    libXinerama
+    libxinerama
     SDL
     libGL
     libmysqlclient
diff --git a/pkgs/by-name/li/libaosd/package.nix b/pkgs/by-name/li/libaosd/package.nix
index 658c9d287dee..30b7fa1fcdef 100644
--- a/pkgs/by-name/li/libaosd/package.nix
+++ b/pkgs/by-name/li/libaosd/package.nix
@@ -5,8 +5,8 @@
   pkg-config,
   cairo,
   pango,
-  libX11,
-  libXcomposite,
+  libx11,
+  libxcomposite,
   autoconf,
   automake,
 }:
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     pango
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
   ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libapplewm/package.nix b/pkgs/by-name/li/libapplewm/package.nix
index 82b2ec2a2a6f..0150a23b88f9 100644
--- a/pkgs/by-name/li/libapplewm/package.nix
+++ b/pkgs/by-name/li/libapplewm/package.nix
@@ -6,8 +6,8 @@
   autoreconfHook,
   util-macros,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   testers,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   passthru = {
diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix
index b58a54f0e8e0..19ea043d8432 100644
--- a/pkgs/by-name/li/libclipboard/package.nix
+++ b/pkgs/by-name/li/libclipboard/package.nix
@@ -4,8 +4,8 @@
   cmake,
   pkg-config,
   libxcb,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lib,
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
   ];
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/li/libclxclient/package.nix b/pkgs/by-name/li/libclxclient/package.nix
index 8c904f4cf5c9..93963da5de64 100644
--- a/pkgs/by-name/li/libclxclient/package.nix
+++ b/pkgs/by-name/li/libclxclient/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   libclthreads,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   xorgproto,
   pkg-config,
 }:
@@ -20,14 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libclthreads
-    libX11
-    libXft
+    libx11
+    libxft
     xorgproto
   ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libXft.dev}/include";
+  env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libxft.dev}/include";
 
   patchPhase = ''
     cd source
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index c10f2392279d..5d3c8acf681a 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -8,7 +8,7 @@
   util-macros,
   python3,
   libGL,
-  libX11,
+  libx11,
   x11Support ? !stdenv.hostPlatform.isDarwin,
   testers,
 }:
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       libGL
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
     ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/li/libfakeXinerama/package.nix b/pkgs/by-name/li/libfakeXinerama/package.nix
index 51f16727c4ec..2b74488e75c6 100644
--- a/pkgs/by-name/li/libfakeXinerama/package.nix
+++ b/pkgs/by-name/li/libfakeXinerama/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/li/libfakekey/package.nix b/pkgs/by-name/li/libfakekey/package.nix
index fc7e30f5c145..0f4d564ce059 100644
--- a/pkgs/by-name/li/libfakekey/package.nix
+++ b/pkgs/by-name/li/libfakekey/package.nix
@@ -5,9 +5,9 @@
   automake,
   autoconf,
   libtool,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   pkg-config,
   xorgproto,
 }:
@@ -32,9 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libfyaml/package.nix b/pkgs/by-name/li/libfyaml/package.nix
index 98fe0d0af9da..cae530843a22 100644
--- a/pkgs/by-name/li/libfyaml/package.nix
+++ b/pkgs/by-name/li/libfyaml/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfyaml";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "pantoniou";
     repo = "libfyaml";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bq8ikZMI92Cn0TMGmQwyZpKt+8D4E8FrbrwAD7dK6Ws=";
+    hash = "sha256-DgXNnmFGZ6a7ELK1SsxPkc5mcVO9w/4uMkhjnqj3CUI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libgdiplus/package.nix b/pkgs/by-name/li/libgdiplus/package.nix
index f8b64f9af93a..48f55c136e3c 100644
--- a/pkgs/by-name/li/libgdiplus/package.nix
+++ b/pkgs/by-name/li/libgdiplus/package.nix
@@ -10,7 +10,7 @@
   giflib,
   libjpeg,
   libpng,
-  libXrender,
+  libxrender,
   libexif,
   autoreconfHook,
 }:
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     giflib
     libjpeg
     libpng
-    libXrender
+    libxrender
     libexif
   ];
 
diff --git a/pkgs/by-name/li/libglvnd/package.nix b/pkgs/by-name/li/libglvnd/package.nix
index 4da13406f394..dafa348a8c2c 100644
--- a/pkgs/by-name/li/libglvnd/package.nix
+++ b/pkgs/by-name/li/libglvnd/package.nix
@@ -7,8 +7,8 @@
   pkg-config,
   python3,
   addDriverRunpath,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
 }:
 
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
     addDriverRunpath
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix
index 9eedb7d2d29d..11dbcb0a86fb 100644
--- a/pkgs/by-name/li/libmatchbox/package.nix
+++ b/pkgs/by-name/li/libmatchbox/package.nix
@@ -6,9 +6,9 @@
   libice,
   libjpeg,
   libpng,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   pango,
   pkg-config,
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libjpeg
     libpng
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     pango
   ];
 
diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix
index 41d2852f60b7..7dd51e377221 100644
--- a/pkgs/by-name/li/libmediainfo/package.nix
+++ b/pkgs/by-name/li/libmediainfo/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmediainfo";
-  version = "25.10";
+  version = "26.01";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${finalAttrs.version}/libmediainfo_${finalAttrs.version}.tar.xz";
-    hash = "sha256-rRPZeXsEbOOdDGWm+B0q7yQpc0whhlpqTFksfAHySd0=";
+    hash = "sha256-vNPSzBLPEIyg+60HVoswMlfnKv2P9z0Fz+a3qg5mocU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix
index 8ea656c325cc..54f3548d1ebc 100644
--- a/pkgs/by-name/li/libngspice/package.nix
+++ b/pkgs/by-name/li/libngspice/package.nix
@@ -6,8 +6,8 @@
   bison,
   fftw,
   withNgshared ? true,
-  libXaw,
-  libXext,
+  libxaw,
+  libxext,
   llvmPackages,
   readline,
 }:
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ]
   ++ lib.optionals (!withNgshared) [
-    libXaw
-    libXext
+    libxaw
+    libxext
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     llvmPackages.openmp
diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index dee8248139b6..fb3fbdf3b7a2 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -12,7 +12,7 @@
   shaderc,
   lcms2,
   libGL,
-  libX11,
+  libx11,
   libunwind,
   libdovi,
   xxHash,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     shaderc
     lcms2
     libGL
-    libX11
+    libx11
     libunwind
     libdovi
     xxHash
diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index edf63e277800..79b4daf6b438 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -12,7 +12,7 @@
   shaderc,
   lcms2,
   libGL,
-  libX11,
+  libx11,
   libunwind,
   libdovi,
 }:
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     shaderc
     lcms2
     libGL
-    libX11
+    libx11
     libunwind
     libdovi
   ];
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index a1a0900ee3f1..5dd04fdf4c07 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index e1bc9b01086c..52fe1e03ffce 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/li/librelane/package.nix b/pkgs/by-name/li/librelane/package.nix
index 58646cd16ff8..f37403654c4c 100644
--- a/pkgs/by-name/li/librelane/package.nix
+++ b/pkgs/by-name/li/librelane/package.nix
@@ -22,14 +22,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "librelane";
-  version = "3.0.0.dev49";
+  version = "3.0.0.dev50";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "librelane";
     repo = "librelane";
     tag = finalAttrs.version;
-    hash = "sha256-g6bQMg9W0gbvJzVvO4ESeAtswbBoUVY3NXLK4UdOcGs=";
+    hash = "sha256-YDLX/aZEutoJ9Nu0aLvvDLwGH3HEGP+vtHdPFDbjEEU=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix
index 3c5735df67c2..f3a635d2779a 100644
--- a/pkgs/by-name/li/libresprite/package.nix
+++ b/pkgs/by-name/li/libresprite/package.nix
@@ -14,7 +14,7 @@
   libpng,
   libwebp,
   libarchive,
-  libX11,
+  libx11,
   pixman,
   tinyxml-2,
   libxi,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libwebp
     libarchive
-    libX11
+    libx11
     pixman
     tinyxml-2
     zlib
diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 242ff18a6a31..2a912b700e6d 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-01-22";
+  version = "0-unstable-2026-01-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "a38704e29b8241788d91c64e935862a6e86a2a47";
-    hash = "sha256-UBMtUlrbJ+8qh56X1ks19HZCKm1FLmp2bWcNpQJIwdc=";
+    rev = "bbdb6153e5832d419702dfbee9e1e621f99aee32";
+    hash = "sha256-V07LnMa7LTLBaSUUhyIuNgrJU2nQa08Yonq5O7vTvyU=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index 16856faf3ed8..f8f1bdc5adb5 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -9,7 +9,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   runtimeDependencies = [
diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index bd054ce43b9b..6dcc44e0ae0e 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4ESzH2pMTGoDI/AAX8Iz/MVhxQD8q5cg9I91ryUi5Ys=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   configureFlags = [ "--disable-debug" ];
   makeFlags = [
diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix
index a3068241012b..cafa225067c8 100644
--- a/pkgs/by-name/li/libssh/package.nix
+++ b/pkgs/by-name/li/libssh/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Don’t build examples, which are not installed and require additional dependencies not
-  # included in `buildInputs` such as libX11.
+  # included in `buildInputs` such as libx11.
   cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ];
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix
index a1a00404d835..2e8d138d36b9 100644
--- a/pkgs/by-name/li/libstartup_notification/package.nix
+++ b/pkgs/by-name/li/libstartup_notification/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libxcb,
   pkg-config,
   libxcb-util,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     libxcb
     libxcb-util
   ];
diff --git a/pkgs/by-name/li/libstrangle/package.nix b/pkgs/by-name/li/libstrangle/package.nix
index 1a2fb56ea598..a4bf68ab9bb9 100644
--- a/pkgs/by-name/li/libstrangle/package.nix
+++ b/pkgs/by-name/li/libstrangle/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   fetchpatch,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv_32bit.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv_32bit.mkDerivation rec {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
   ];
 
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/li/libstroke/package.nix b/pkgs/by-name/li/libstroke/package.nix
index 5f15eedd1d19..895cb7959902 100644
--- a/pkgs/by-name/li/libstroke/package.nix
+++ b/pkgs/by-name/li/libstroke/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   automake,
   autoconf,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     automake
     autoconf
   ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
   # Also, modern automake doesn't like things and returns error code 63.  But it generates the file.
diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix
index 8ae36f2c475f..63008f738ad5 100644
--- a/pkgs/by-name/li/libuiohook/package.nix
+++ b/pkgs/by-name/li/libuiohook/package.nix
@@ -5,7 +5,7 @@
   nixosTests,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   xinput,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
     libxcb
     libxkbcommon
     xinput
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index e380334562de..3cf6844260b3 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libpthread-stubs,
-  libXau,
-  libXdmcp,
-  libXext,
+  libxau,
+  libxdmcp,
+  libxext,
   libvdpau,
   glib,
   libva,
@@ -32,11 +32,11 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libpthread-stubs
-    libXau
-    libXdmcp
-    libXext
+    libxau
+    libxdmcp
+    libxext
     libvdpau
     glib
     libva
diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index 3e7579fa56d1..2967df353a2b 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   linuxPackages,
 }:
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     linuxPackages.nvidia_x11.settings.libXNVCtrl
   ];
 
diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix
index 0afb6ae53ea3..c6068d05b232 100644
--- a/pkgs/by-name/li/libxcb-cursor/package.nix
+++ b/pkgs/by-name/li/libxcb-cursor/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "XCB port of libXcursor";
+    description = "XCB port of libxcursor";
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor";
     license = lib.licenses.x11;
     maintainers = with lib.maintainers; [ lovek323 ];
diff --git a/pkgs/by-name/li/libxcomp/package.nix b/pkgs/by-name/li/libxcomp/package.nix
index 4d72ddc306da..b714c622d7ec 100644
--- a/pkgs/by-name/li/libxcomp/package.nix
+++ b/pkgs/by-name/li/libxcomp/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libjpeg
     libpng
-    libX11
+    libx11
     zlib
   ];
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libxext/package.nix b/pkgs/by-name/li/libxext/package.nix
index 34fce443803a..879d0c6233d9 100644
--- a/pkgs/by-name/li/libxext/package.nix
+++ b/pkgs/by-name/li/libxext/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
   libxau,
   writeScript,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/li/libxfce4windowing/package.nix b/pkgs/by-name/li/libxfce4windowing/package.nix
index 34a5b7a020d7..755b4e07c9dc 100644
--- a/pkgs/by-name/li/libxfce4windowing/package.nix
+++ b/pkgs/by-name/li/libxfce4windowing/package.nix
@@ -13,8 +13,8 @@
   gtk3,
   libdisplay-info,
   libwnck,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   wayland,
   wayland-protocols,
   wlr-protocols,
@@ -71,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libdisplay-info
     libwnck
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     wayland
     wayland-protocols
     wlr-protocols
diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix
index 026a2d4259ec..995e1632509c 100644
--- a/pkgs/by-name/li/libxfixes/package.nix
+++ b/pkgs/by-name/li/libxfixes/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
+  libx11,
   writeScript,
   testers,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
+    libx11
   ];
 
   passthru = {
diff --git a/pkgs/by-name/li/libxft/package.nix b/pkgs/by-name/li/libxft/package.nix
index 3f5955be00ac..f26a9585c48f 100644
--- a/pkgs/by-name/li/libxft/package.nix
+++ b/pkgs/by-name/li/libxft/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "X FreeType library";
     longDescription = ''
-      libXft is the client side font rendering library, using libfreetype, libX11, and the
+      libxft is the client side font rendering library, using libfreetype, libx11, and the
       X Render extension to display anti-aliased text.
     '';
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxft";
diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
index 899b321079e7..99accf6f6af6 100644
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -11,7 +11,7 @@
   libxcb,
   libxml2,
   python3,
-  libX11,
+  libx11,
   # To enable the "interactive-wayland" subcommand of xkbcli. This is the
   # wayland equivalent of `xev` on X11.
   xvfb,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
     "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
-    "-Dx-locale-root=${libX11.out}/share/X11/locale"
+    "-Dx-locale-root=${libx11.out}/share/X11/locale"
     "-Denable-docs=true"
     "-Denable-wayland=${lib.boolToString withWaylandTools}"
   ];
diff --git a/pkgs/by-name/li/libxv/package.nix b/pkgs/by-name/li/libxv/package.nix
index df8cd9625aaa..2694b2266ed8 100644
--- a/pkgs/by-name/li/libxv/package.nix
+++ b/pkgs/by-name/li/libxv/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   writeScript,
   testers,
 }:
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   configureFlags = lib.optional (
diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix
index 7ce4d196f44b..d6bbc15c7ab4 100644
--- a/pkgs/by-name/li/libxvmc/package.nix
+++ b/pkgs/by-name/li/libxvmc/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
-  libXext,
-  libXv,
+  libx11,
+  libxext,
+  libxv,
   writeScript,
   testers,
 }:
@@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
-    libXv
+    libx11
+    libxext
+    libxv
   ];
 
   propagatedBuildInputs = [ xorgproto ];
diff --git a/pkgs/by-name/li/libxxf86dga/package.nix b/pkgs/by-name/li/libxxf86dga/package.nix
index 4dc5b64c16a4..20fa91a5f2af 100644
--- a/pkgs/by-name/li/libxxf86dga/package.nix
+++ b/pkgs/by-name/li/libxxf86dga/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   writeScript,
   testers,
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libxxf86vm/package.nix b/pkgs/by-name/li/libxxf86vm/package.nix
index d399d8203a79..e7f342170eb6 100644
--- a/pkgs/by-name/li/libxxf86vm/package.nix
+++ b/pkgs/by-name/li/libxxf86vm/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   writeScript,
   testers,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
index 4a680551a75a..364cf7824910 100644
--- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
@@ -13,8 +13,8 @@
   pixman,
   libcanberra,
   libgnomekbd,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   linkFarm,
   lightdm-slick-greeter,
   numlockx,
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     libcanberra
     libgnomekbd # needed by XApp.KbdLayoutController
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   pythonPath = [
diff --git a/pkgs/by-name/li/lightdm/package.nix b/pkgs/by-name/li/lightdm/package.nix
index 49931a0ba5ed..3b250902fc43 100644
--- a/pkgs/by-name/li/lightdm/package.nix
+++ b/pkgs/by-name/li/lightdm/package.nix
@@ -13,7 +13,7 @@
   libtool,
   libxcb,
   glib,
-  libXdmcp,
+  libxdmcp,
   itstool,
   intltool,
   libxklavier,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     accountsservice
     audit
     glib
-    libXdmcp
+    libxdmcp
     libgcrypt
     libxcb
     libxklavier
diff --git a/pkgs/by-name/li/lightlocker/package.nix b/pkgs/by-name/li/lightlocker/package.nix
index 57cb6296927a..1f155094a21c 100644
--- a/pkgs/by-name/li/lightlocker/package.nix
+++ b/pkgs/by-name/li/lightlocker/package.nix
@@ -10,10 +10,10 @@
   glib,
   intltool,
   dbus-glib,
-  libX11,
-  libXScrnSaver,
-  libXxf86vm,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxxf86vm,
+  libxext,
   systemd,
   pantheon,
   wrapGAppsHook3,
@@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
     dbus-glib
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXext
-    libXxf86vm
+    libx11
+    libxscrnsaver
+    libxext
+    libxxf86vm
     systemd
   ];
 
diff --git a/pkgs/by-name/li/lightum/package.nix b/pkgs/by-name/li/lightum/package.nix
index 59fe1ec552a1..3bcd461a098b 100644
--- a/pkgs/by-name/li/lightum/package.nix
+++ b/pkgs/by-name/li/lightum/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXScrnSaver,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxext,
   glib,
   dbus,
   pkg-config,
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
   buildInputs = [
     dbus
     glib
-    libX11
-    libXScrnSaver
-    libXext
+    libx11
+    libxscrnsaver
+    libxext
     systemd
   ];
 
diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix
index 734b8868105c..61f963b1ba88 100644
--- a/pkgs/by-name/li/lincity-ng/package.nix
+++ b/pkgs/by-name/li/lincity-ng/package.nix
@@ -10,7 +10,7 @@
   lib,
   libwebp,
   libtiff,
-  libX11,
+  libx11,
   libxml2,
   libxmlxx5,
   libxslt,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libX11
+    libx11
     libwebp
     libtiff
     libxmlxx5
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index 3082377791e9..bb3cd8da3b08 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   fetchpatch,
   gettext,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   libice,
   libsm,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libpng12
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
     zlib
   ];
diff --git a/pkgs/by-name/li/links2/package.nix b/pkgs/by-name/li/links2/package.nix
index bbc99d936845..dae295f20689 100644
--- a/pkgs/by-name/li/links2/package.nix
+++ b/pkgs/by-name/li/links2/package.nix
@@ -18,9 +18,9 @@
   enableDirectFB ? false,
   directfb,
   enableX11 ? (!stdenv.hostPlatform.isDarwin),
-  libX11,
-  libXt,
-  libXau, # GUI support
+  libx11,
+  libxt,
+  libxau, # GUI support
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -46,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]
   ++ lib.optionals enableX11 [
-    libX11
-    libXau
-    libXt
+    libx11
+    libxau
+    libxt
   ]
   ++ lib.optionals enableDirectFB [ directfb ];
 
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 8ae41a2c0c0d..324684d1e879 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -18,11 +18,11 @@
   glm,
   gmp,
   kissfftFloat,
-  libXau,
-  libXdmcp,
-  libXpm,
-  libXrandr,
-  libXxf86vm,
+  libxau,
+  libxdmcp,
+  libxpm,
+  libxrandr,
+  libxxf86vm,
   libdecor,
   libffi,
   libglut,
@@ -80,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     gmp
     kissfftFloat
-    libXau
-    libXdmcp
-    libXpm
-    libXrandr
-    libXxf86vm
+    libxau
+    libxdmcp
+    libxpm
+    libxrandr
+    libxxf86vm
     libdecor
     libffi
     libglut
diff --git a/pkgs/by-name/li/liquidwar/package.nix b/pkgs/by-name/li/liquidwar/package.nix
index e784fcbb960b..db0bb6b939fe 100644
--- a/pkgs/by-name/li/liquidwar/package.nix
+++ b/pkgs/by-name/li/liquidwar/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   xorgproto,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   gmp,
   libjpeg,
   libpng,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xorgproto
-    libX11
+    libx11
     gmp
     guile_2_0
     libjpeg
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libogg
     libvorbis
     csound
-    libXrender
+    libxrender
     libcaca
     cunit
     libtool
diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix
index bef5a9bbcbc4..95f3c0d223c3 100644
--- a/pkgs/by-name/li/lirc/package.nix
+++ b/pkgs/by-name/li/lirc/package.nix
@@ -16,7 +16,7 @@
   libftdi1,
   libice,
   libsm,
-  libX11,
+  libx11,
 }:
 
 let
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     libftdi1
     libice
     libsm
-    libX11
+    libx11
   ];
 
   DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h";
diff --git a/pkgs/by-name/li/lisgd/package.nix b/pkgs/by-name/li/lisgd/package.nix
index e20df90c02b0..aa4aacd13494 100644
--- a/pkgs/by-name/li/lisgd/package.nix
+++ b/pkgs/by-name/li/lisgd/package.nix
@@ -4,7 +4,7 @@
   fetchFromSourcehut,
   writeText,
   libinput,
-  libX11,
+  libx11,
   wayland,
   conf ? null,
   patches ? [ ],
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libinput
-    libX11
+    libx11
     wayland
   ];
 
diff --git a/pkgs/by-name/li/listres/package.nix b/pkgs/by-name/li/listres/package.nix
index b473b29f671f..f4fb53abc6c6 100644
--- a/pkgs/by-name/li/listres/package.nix
+++ b/pkgs/by-name/li/listres/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Utility to list X resources for a widget written using a toolkit based on libXt";
+    description = "Utility to list X resources for a widget written using a toolkit based on libxt";
     homepage = "https://gitlab.freedesktop.org/xorg/app/listres";
     license = lib.licenses.x11;
     mainProgram = "listres";
diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix
index 36b71ef91c8f..1632a39bde40 100644
--- a/pkgs/by-name/ll/llpp/package.nix
+++ b/pkgs/by-name/ll/llpp/package.nix
@@ -6,7 +6,7 @@
   ocaml,
   pkg-config,
   mupdf,
-  libX11,
+  libx11,
   jbig2dec,
   openjpeg,
   libjpeg,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     mupdf
-    libX11
+    libx11
     freetype
     zlib
     gumbo
diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix
index 9af9fa3ee0e2..a8657d651482 100644
--- a/pkgs/by-name/lo/logstalgia/package.nix
+++ b/pkgs/by-name/lo/logstalgia/package.nix
@@ -12,7 +12,7 @@
   glew,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   boost,
   glm,
   freetype,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ftgl
     libpng
     libjpeg
-    libX11
+    libx11
     pcre2
     SDL2_image
     libGLU
diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
index 00d152b715cb..4860b936c30f 100644
--- a/pkgs/by-name/lo/looking-glass-client/package.nix
+++ b/pkgs/by-name/lo/looking-glass-client/package.nix
@@ -14,16 +14,16 @@
   libGL,
   nanosvg,
 
-  libX11,
+  libx11,
   libxkbcommon,
-  libXext,
-  libXrandr,
-  libXi,
-  libXScrnSaver,
-  libXinerama,
-  libXcursor,
-  libXpresent,
-  libXdmcp,
+  libxext,
+  libxrandr,
+  libxi,
+  libxscrnsaver,
+  libxinerama,
+  libxcursor,
+  libxpresent,
+  libxdmcp,
 
   wayland,
   wayland-protocols,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libGL
     freefont_ttf
     spice-protocol
@@ -75,14 +75,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals xorgSupport [
     libxkbcommon
-    libXi
-    libXScrnSaver
-    libXinerama
-    libXcursor
-    libXpresent
-    libXext
-    libXrandr
-    libXdmcp
+    libxi
+    libxscrnsaver
+    libxinerama
+    libxcursor
+    libxpresent
+    libxext
+    libxrandr
+    libxdmcp
   ]
   ++ lib.optionals waylandSupport [
     libxkbcommon
diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix
index 614d46b80c6e..f7795d8020d2 100644
--- a/pkgs/by-name/lo/lorien/package.nix
+++ b/pkgs/by-name/lo/lorien/package.nix
@@ -14,14 +14,14 @@
   libGL,
   libGLU,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   zlib,
   udev, # for libudev
 }:
@@ -56,14 +56,14 @@ stdenv.mkDerivation rec {
     alsa-lib
     libGL
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     zlib
     udev
   ];
diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index bff58b111ab2..122e9bb7a5cc 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -10,8 +10,8 @@
   libdrm,
   libGL,
   libinput,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxkbcommon,
   libgbm,
   pixman,
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
     libGL
     libinput
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libxkbcommon
     libgbm
     pixman
diff --git a/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch b/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
new file mode 100644
index 000000000000..875eea6a0854
--- /dev/null
+++ b/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
@@ -0,0 +1,254 @@
+diff --git a/package-lock.json b/package-lock.json
+index 5ddd914..8d4a12a 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -9,11 +9,11 @@
+       "version": "0.0.0",
+       "dependencies": {
+         "@tanstack/vue-virtual": "^3.1.2",
+-        "@tauri-apps/api": "^2.1.1",
+-        "@tauri-apps/plugin-dialog": "^2.2.0",
+-        "@tauri-apps/plugin-global-shortcut": "^2.2.0",
+-        "@tauri-apps/plugin-os": "^2.2.0",
+-        "@tauri-apps/plugin-shell": "^2.2.0",
++        "@tauri-apps/api": "2.8.0",
++        "@tauri-apps/plugin-dialog": "2.4.0",
++        "@tauri-apps/plugin-global-shortcut": "^2.3.0",
++        "@tauri-apps/plugin-os": "^2.3.0",
++        "@tauri-apps/plugin-shell": "^2.3.0",
+         "codemirror": "^6.0.1",
+         "floating-vue": "^5.2.2",
+         "lodash": "^4.17.21",
+@@ -381,9 +381,9 @@
+       }
+     },
+     "node_modules/@tauri-apps/api": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
+-      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
++      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==",
+       "license": "Apache-2.0 OR MIT",
+       "funding": {
+         "type": "opencollective",
+@@ -590,39 +590,39 @@
+       }
+     },
+     "node_modules/@tauri-apps/plugin-dialog": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
+-      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
++      "version": "2.4.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
++      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-global-shortcut": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
+-      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
++      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-os": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
+-      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
++      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-shell": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
+-      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
++      "version": "2.3.4",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
++      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@types/web-bluetooth": {
+@@ -1043,6 +1043,7 @@
+           "url": "https://tidelift.com/funding/github/npm/browserslist"
+         }
+       ],
++      "peer": true,
+       "dependencies": {
+         "caniuse-lite": "^1.0.30001400",
+         "electron-to-chromium": "^1.4.251",
+@@ -1124,6 +1125,7 @@
+       "version": "6.0.1",
+       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
++      "peer": true,
+       "dependencies": {
+         "@codemirror/autocomplete": "^6.0.0",
+         "@codemirror/commands": "^6.0.0",
+@@ -1681,6 +1683,7 @@
+       "version": "7.6.2",
+       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
+       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
++      "peer": true,
+       "dependencies": {
+         "tabbable": "^6.2.0"
+       }
+@@ -2147,6 +2150,7 @@
+           "url": "https://github.com/sponsors/ai"
+         }
+       ],
++      "peer": true,
+       "dependencies": {
+         "nanoid": "^3.3.7",
+         "picocolors": "^1.1.0",
+@@ -2721,6 +2725,7 @@
+       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
+       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
+       "dev": true,
++      "peer": true,
+       "dependencies": {
+         "esbuild": "^0.15.9",
+         "postcss": "^8.4.16",
+@@ -2761,6 +2766,7 @@
+       "version": "3.5.10",
+       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
++      "peer": true,
+       "dependencies": {
+         "@vue/compiler-dom": "3.5.10",
+         "@vue/compiler-sfc": "3.5.10",
+@@ -3221,9 +3227,9 @@
+       }
+     },
+     "@tauri-apps/api": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
+-      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A=="
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
++      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw=="
+     },
+     "@tauri-apps/cli": {
+       "version": "2.1.0",
+@@ -3314,35 +3320,35 @@
+       "optional": true
+     },
+     "@tauri-apps/plugin-dialog": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
+-      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
++      "version": "2.4.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
++      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-global-shortcut": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
+-      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
++      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-os": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
+-      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
++      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-shell": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
+-      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
++      "version": "2.3.4",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
++      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@types/web-bluetooth": {
+@@ -3586,6 +3592,7 @@
+       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+       "dev": true,
++      "peer": true,
+       "requires": {
+         "caniuse-lite": "^1.0.30001400",
+         "electron-to-chromium": "^1.4.251",
+@@ -3636,6 +3643,7 @@
+       "version": "6.0.1",
+       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
++      "peer": true,
+       "requires": {
+         "@codemirror/autocomplete": "^6.0.0",
+         "@codemirror/commands": "^6.0.0",
+@@ -3965,6 +3973,7 @@
+       "version": "7.6.2",
+       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
+       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
++      "peer": true,
+       "requires": {
+         "tabbable": "^6.2.0"
+       }
+@@ -4285,6 +4294,7 @@
+       "version": "8.4.47",
+       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+       "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
++      "peer": true,
+       "requires": {
+         "nanoid": "^3.3.7",
+         "picocolors": "^1.1.0",
+@@ -4638,6 +4648,7 @@
+       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
+       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
+       "dev": true,
++      "peer": true,
+       "requires": {
+         "esbuild": "^0.15.9",
+         "fsevents": "~2.3.2",
+@@ -4650,6 +4661,7 @@
+       "version": "3.5.10",
+       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
++      "peer": true,
+       "requires": {
+         "@vue/compiler-dom": "3.5.10",
+         "@vue/compiler-sfc": "3.5.10",
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index d0fe49afd5b2..05809e139915 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -22,24 +22,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lrcget";
-  version = "0.9.3";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
     tag = version;
-    hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4=";
+    hash = "sha256-4XeOIOV8QyJheVN98u/jo8H+n9AIzvVJITCk9d+kpFA=";
   };
 
   patches = [
     # needed to not attempt codesigning on darwin
     ./remove-signing-identity.patch
+
+    # Update NPM package versions to fix https://github.com/tranxuanthang/lrcget/issues/309
+    ./fix-tauri-version-mismatch.patch
   ];
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = "src-tauri";
 
-  cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM=";
+  cargoHash = "sha256-EjciD794MqUnp3CVloOPugbSfcxgfy7TdCUOlK6P+sk=";
 
   # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts
   # but has no lockfile, which is something that will probably break.
@@ -47,8 +50,8 @@ rustPlatform.buildRustPackage rec {
 
   npmDeps = fetchNpmDeps {
     name = "lrcget-${version}-npm-deps";
-    inherit src forceGitDeps;
-    hash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE=";
+    inherit src forceGitDeps patches;
+    hash = "sha256-iaxNrZLcb9qM5EPRtzoXw6izZBeS/rqgGaZpA2A2oho=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index e7f52ff234e4..bd5df5a9eab2 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -8,7 +8,7 @@
   ladspaH,
   libGL,
   libGLU,
-  libXrandr,
+  libxrandr,
   libsndfile,
   lv2,
   php84,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ladspaH
     libGL
     libGLU
-    libXrandr
+    libxrandr
     libsndfile
     lv2
   ];
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index 826d2dba15e7..1c64f5602cf3 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -13,8 +13,8 @@
   glib,
   libnl,
   udev,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   pcre2,
   pcre,
   util-linux,
@@ -23,7 +23,7 @@
   lua5,
   docutils,
   libxcb,
-  libX11,
+  libx11,
   libxcb-util,
   libxcb-wm,
 }:
@@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libX11
+    libx11
     libxcb-util
     libxcb-wm
-    libXdmcp
-    libXau
+    libxdmcp
+    libxau
     libpulseaudio
     libnl
     libselinux
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index 0700b10caae6..7a3eeb487c45 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -12,10 +12,10 @@
   fontconfig,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
   libxkbcommon,
   vulkan-loader,
   wayland,
@@ -57,10 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libX11
-    libXcursor
-    libXrandr
-    libXi
+    libx11
+    libxcursor
+    libxrandr
+    libxi
     cairo
     pango
     atkmm
@@ -93,10 +93,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
         bzip2
         fontconfig
         freetype
-        libX11
-        libXcursor
-        libXrandr
-        libXi
+        libx11
+        libxcursor
+        libxrandr
+        libxi
         libxkbcommon
         vulkan-loader
         wayland
diff --git a/pkgs/by-name/lu/lukesmithxyz-st/package.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
index 6f27f920ad99..08d170cc084f 100644
--- a/pkgs/by-name/lu/lukesmithxyz-st/package.nix
+++ b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   harfbuzz,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
 }:
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
   buildInputs = [
     fontconfig
     harfbuzz
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index 231d32a5f13a..3a313604b531 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -7,12 +7,12 @@
   zlib,
   libgcc,
   fontconfig,
-  libX11,
+  libx11,
   lttng-ust,
   icu,
   libice,
   libsm,
-  libXcursor,
+  libxcursor,
   openssl,
   imagemagick,
   makeWrapper,
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Runtime deps
     libice
     libsm
-    libX11
-    libXcursor
+    libx11
+    libxcursor
   ];
 
   nativeBuildInputs = [
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
   runtimeDependencies = [
     libice
     libsm
-    libX11
-    libXcursor
+    libx11
+    libxcursor
   ];
 
   dontBuild = true;
diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix
index a26ba20cdbd3..27278afd0a63 100644
--- a/pkgs/by-name/lw/lwm/package.nix
+++ b/pkgs/by-name/lw/lwm/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   imake,
-  libX11,
+  libx11,
   libsm,
-  libXext,
+  libxext,
   libice,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ imake ];
 
   buildInputs = [
-    libX11
+    libx11
     libsm
-    libXext
+    libxext
     libice
   ];
 
diff --git a/pkgs/by-name/lx/lxappearance/package.nix b/pkgs/by-name/lx/lxappearance/package.nix
index 4897e6613d8a..8e083b830e76 100644
--- a/pkgs/by-name/lx/lxappearance/package.nix
+++ b/pkgs/by-name/lx/lxappearance/package.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   intltool,
   pkg-config,
-  libX11,
+  libx11,
   gtk2,
   gtk3,
   libxslt,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     (if withGtk3 then gtk3 else gtk2)
   ];
 
diff --git a/pkgs/by-name/lx/lxpanel/package.nix b/pkgs/by-name/lx/lxpanel/package.nix
index dd55e41bb898..d23c0eed34a5 100644
--- a/pkgs/by-name/lx/lxpanel/package.nix
+++ b/pkgs/by-name/lx/lxpanel/package.nix
@@ -12,12 +12,12 @@
   keybinder3,
   gtk2-x11,
   gtk3,
-  libX11,
+  libx11,
   libfm,
   libwnck,
   libwnck2,
-  libXmu,
-  libXpm,
+  libxmu,
+  libxpm,
   cairo,
   gdk-pixbuf,
   gdk-pixbuf-xlib,
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     (if withGtk3 then keybinder3 else keybinder)
     (if withGtk3 then gtk3 else gtk2-x11)
-    libX11
+    libx11
     (libfm.override { inherit withGtk3; })
     (if withGtk3 then libwnck else libwnck2)
-    libXmu
-    libXpm
+    libxmu
+    libxpm
     cairo
     gdk-pixbuf
     gdk-pixbuf-xlib.dev
diff --git a/pkgs/by-name/lx/lxrandr/package.nix b/pkgs/by-name/lx/lxrandr/package.nix
index 2399a5c327d9..70a386945c48 100644
--- a/pkgs/by-name/lx/lxrandr/package.nix
+++ b/pkgs/by-name/lx/lxrandr/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   intltool,
   gtk2,
-  libX11,
+  libx11,
   xrandr,
   withGtk3 ? false,
   gtk3,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./respect-xml-catalog-files-var.patch ];
 
   buildInputs = [
-    libX11
+    libx11
     xrandr
     (if withGtk3 then gtk3 else gtk2)
   ];
diff --git a/pkgs/by-name/lx/lxsession/package.nix b/pkgs/by-name/lx/lxsession/package.nix
index fc73628cf152..f15d5dc90ad9 100644
--- a/pkgs/by-name/lx/lxsession/package.nix
+++ b/pkgs/by-name/lx/lxsession/package.nix
@@ -11,7 +11,7 @@
   pkg-config,
   wrapGAppsHook3,
   gtk2-x11,
-  libX11,
+  libx11,
   polkit,
   vala,
 }:
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk2-x11
-    libX11
+    libx11
     polkit
     vala
   ];
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 874014e873d6..51ddcae2e638 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -7,7 +7,7 @@
   python3,
   m4,
   cairo,
-  libX11,
+  libx11,
   mesa,
   mesa_glu,
   ncurses,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    libX11
+    libx11
     m4
     mesa_glu
     ncurses
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 068045540b59..9dfbbad7191c 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -11,11 +11,11 @@
   libGLU,
   libGL,
   glm,
-  libX11,
-  libXext,
-  libXfixes,
-  libXrandr,
-  libXcomposite,
+  libx11,
+  libxext,
+  libxfixes,
+  libxrandr,
+  libxcomposite,
   slop,
   icu,
 }:
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     glm
-    libX11
-    libXext
-    libXfixes
-    libXrandr
-    libXcomposite
+    libx11
+    libxext
+    libxfixes
+    libxrandr
+    libxcomposite
     slop
     icu
   ];
diff --git a/pkgs/by-name/ma/mamba/package.nix b/pkgs/by-name/ma/mamba/package.nix
index d6af2ccfc0fb..d12b7cb7f624 100644
--- a/pkgs/by-name/ma/mamba/package.nix
+++ b/pkgs/by-name/ma/mamba/package.nix
@@ -6,7 +6,7 @@
   xxd,
   cairo,
   fluidsynth,
-  libX11,
+  libx11,
   libjack2,
   alsa-lib,
   liblo,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     fluidsynth
-    libX11
+    libx11
     libjack2
     alsa-lib
     liblo
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index 1a0bb75f0a1d..30cc9815ddf0 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  libX11,
+  libx11,
   libinput,
   libxcb,
   libxkbcommon,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
   ]
   ++ lib.optionals enableXWayland [
-    libX11
+    libx11
     libxcb-wm
     xwayland
   ];
diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix
index dced5f900a67..a657dbf416ca 100644
--- a/pkgs/by-name/ma/marvin/package.nix
+++ b/pkgs/by-name/ma/marvin/package.nix
@@ -11,11 +11,11 @@
   openjdk17,
   freetype,
   fontconfig,
-  libXi,
-  libX11,
-  libXext,
-  libXtst,
-  libXrender,
+  libxi,
+  libx11,
+  libxext,
+  libxtst,
+  libxrender,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     freetype
     fontconfig
-    libXi
-    libX11
-    libXext
-    libXtst
-    libXrender
+    libxi
+    libx11
+    libxext
+    libxtst
+    libxrender
   ];
 
   unpackPhase = ''
diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix
index 433a684780f2..700d724a87a9 100644
--- a/pkgs/by-name/ma/master_me/package.nix
+++ b/pkgs/by-name/ma/master_me/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   pkg-config,
   python3,
 }:
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ma/matchbox/package.nix b/pkgs/by-name/ma/matchbox/package.nix
index 804dffdda545..24a20f657b60 100644
--- a/pkgs/by-name/ma/matchbox/package.nix
+++ b/pkgs/by-name/ma/matchbox/package.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   pkg-config,
   libmatchbox,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmatchbox ];
-  NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib";
+  NIX_LDFLAGS = "-lX11 -L${libx11}/lib -lXext -L${libxext}/lib";
 
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${finalAttrs.version}/matchbox-window-manager-${finalAttrs.version}.tar.bz2";
diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index 8a3714fc9b94..aea2a41e93c2 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -5,14 +5,14 @@
   godot3-headless,
   godot3-export-templates,
   libglvnd,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   nix-update-script,
 }:
 
@@ -32,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libglvnd
 
-    libXinerama
-    libXcursor
-    libXext
-    libXrandr
-    libXrender
-    libX11
-    libXi
-    libXfixes
+    libxinerama
+    libxcursor
+    libxext
+    libxrandr
+    libxrender
+    libx11
+    libxi
+    libxfixes
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix
index 3bdd3760e413..77bd151b1175 100644
--- a/pkgs/by-name/ma/matrix-brandy/package.nix
+++ b/pkgs/by-name/ma/matrix-brandy/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   nix-update-script,
   SDL,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL
   ];
 
diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix
index 8d96a6db3423..9bff29d93e5e 100644
--- a/pkgs/by-name/mc/mc/package.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -19,7 +19,7 @@
   coreutils,
   darwin,
   x11Support ? true,
-  libX11,
+  libx11,
 
   # updater only
   writeScript,
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     slang
     zip
   ]
-  ++ lib.optionals x11Support [ libX11 ]
+  ++ lib.optionals x11Support [ libx11 ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     e2fsprogs
     gpm
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) ''
     # libX11.so is loaded dynamically so autopatch doesn't detect it
     patchelf \
-      --add-needed ${libX11}/lib/libX11.so \
+      --add-needed ${libx11}/lib/libX11.so \
       $out/bin/mc
   '';
 
diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix
index 12740a89e103..62b03e0d9e00 100644
--- a/pkgs/by-name/mc/mcaimi-st/package.nix
+++ b/pkgs/by-name/mc/mcaimi-st/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fontconfig,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
   nix-update-script,
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     fontconfig
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index 670eb6f0f4c8..4eaf6acd652c 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -5,7 +5,7 @@
   autoPatchelfHook,
   alsa-lib,
   gcc-unwrapped,
-  libX11,
+  libx11,
   libcxx,
   libdrm,
   libgbm,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     gcc-unwrapped
-    libX11
+    libx11
     libcxx
     libdrm
     libgbm
diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix
index 8596d5c1c4b4..45368d567d9f 100644
--- a/pkgs/by-name/me/mednafen/package.nix
+++ b/pkgs/by-name/me/mednafen/package.nix
@@ -8,7 +8,7 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libcdio,
   libiconv,
   libjack2,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libGL
     libGLU
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/me/meh/package.nix b/pkgs/by-name/me/meh/package.nix
index 9c5dd2792fc0..e3b3e0e54b78 100644
--- a/pkgs/by-name/me/meh/package.nix
+++ b/pkgs/by-name/me/meh/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libjpeg,
   libpng,
   giflib,
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libXext
-    libX11
+    libxext
+    libx11
     libjpeg
     libpng
     giflib
diff --git a/pkgs/by-name/me/mesa-demos/package.nix b/pkgs/by-name/me/mesa-demos/package.nix
index c219ee98c21b..7600b3c29fe2 100644
--- a/pkgs/by-name/me/mesa-demos/package.nix
+++ b/pkgs/by-name/me/mesa-demos/package.nix
@@ -5,9 +5,9 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
+  libxext,
   libgbm,
   mesa,
   meson,
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libglut
-    libX11
+    libx11
     libxcb
-    libXext
+    libxext
     libGL
     libGLU
     libgbm
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
index 0fc87dc8ce19..8f5287167819 100644
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   wrapGAppsHook3,
   gtk3,
-  libX11,
+  libx11,
   SDL2,
 }:
 
@@ -62,7 +62,7 @@ buildDotnetModule rec {
 
     nativeBuildInputs = [ SDL2 ];
 
-    buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ];
+    buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libx11 ];
 
     makeFlags = [ "core" ];
 
diff --git a/pkgs/by-name/me/meshtasticd/package.nix b/pkgs/by-name/me/meshtasticd/package.nix
index 8c7a1efa6c16..39dd4b912cb7 100644
--- a/pkgs/by-name/me/meshtasticd/package.nix
+++ b/pkgs/by-name/me/meshtasticd/package.nix
@@ -9,7 +9,7 @@
   writableTmpDirAsHomeHook,
   bluez,
   i2c-tools,
-  libX11,
+  libx11,
   libgpiod_1,
   libinput,
   libusb1,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bluez
     i2c-tools
-    libX11
+    libx11
     libgpiod_1
     libinput
     libusb1
diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix
index c326b69df65c..052d245f6216 100644
--- a/pkgs/by-name/me/methane/package.nix
+++ b/pkgs/by-name/me/methane/package.nix
@@ -15,11 +15,11 @@
   openal,
   quesoglc,
   clanlib,
-  libXrender,
+  libxrender,
   libmikmod,
   alsa-lib,
   nix-update-script,
-  libXinerama,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     openal
     quesoglc
     clanlib
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
     libmikmod
     alsa-lib
   ];
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index f4165829168f..8d777aa030af 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -25,20 +25,20 @@
   libdrm,
   libglvnd,
   libkrb5,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   libxkbcommon,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
   libxshmfence,
-  libXtst,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -122,20 +122,20 @@ let
     libglvnd
     libkrb5
     libpng
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     libxkbcommon
-    libXrandr
-    libXrender
-    libXScrnSaver
+    libxrandr
+    libxrender
+    libxscrnsaver
     libxshmfence
-    libXtst
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/mi/mid2key/package.nix b/pkgs/by-name/mi/mid2key/package.nix
index f5c3624b4464..619d21e91625 100644
--- a/pkgs/by-name/mi/mid2key/package.nix
+++ b/pkgs/by-name/mi/mid2key/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   alsa-lib,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   xorgproto,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     xorgproto
   ];
 
diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix
index 2a6fce4ddcf9..3153073f5bf4 100644
--- a/pkgs/by-name/mi/midivisualizer/package.nix
+++ b/pkgs/by-name/mi/midivisualizer/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libnotify,
   glfw,
   makeWrapper,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   gtk3,
   ffmpeg-full,
 }:
@@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     libnotify
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     gtk3
   ];
 
diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix
index bb42d6b52701..2014f4b70b59 100644
--- a/pkgs/by-name/mi/minilibx/package.nix
+++ b/pkgs/by-name/mi/minilibx/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   installShellFiles,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   unstableGitUpdater,
 }:
 
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   dontConfigure = true;
diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix
index c627ffaba3f9..d1e640ac43bb 100644
--- a/pkgs/by-name/mi/minimacy/package.nix
+++ b/pkgs/by-name/mi/minimacy/package.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   makeBinaryWrapper,
 }:
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/mi/mitscheme/package.nix b/pkgs/by-name/mi/mitscheme/package.nix
index fb14fd822560..8f311d6c15ce 100644
--- a/pkgs/by-name/mi/mitscheme/package.nix
+++ b/pkgs/by-name/mi/mitscheme/package.nix
@@ -13,7 +13,7 @@
   ghostscript,
   ncurses,
   enableX11 ? false,
-  libX11,
+  libx11,
 }:
 
 let
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libX11 ];
+  buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libx11 ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index e89cdfcd91f8..157948c85891 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -6,7 +6,7 @@
   libdv,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   pkg-config,
   SDL,
   SDL_gfx,
@@ -16,7 +16,7 @@
 # TODO:
 # - make dependencies optional
 # - libpng-apng as alternative to libpng?
-# - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
+# - libxxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mjpegtools";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!withMinimal) [
     gtk2
-    libX11
+    libx11
     SDL
     SDL_gfx
   ];
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 8d641d776061..3fb58e3c3516 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -14,7 +14,7 @@
   libsamplerate,
   libvorbis,
   libxml2,
-  libX11,
+  libx11,
   makeWrapper,
   movit,
   opencv4,
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableSDL2 [
     SDL2
-    libX11
+    libx11
   ];
 
   outputs = [
diff --git a/pkgs/by-name/ml/mlterm/package.nix b/pkgs/by-name/ml/mlterm/package.nix
index 9aadc0117a08..a6232340a0b6 100644
--- a/pkgs/by-name/ml/mlterm/package.nix
+++ b/pkgs/by-name/ml/mlterm/package.nix
@@ -43,8 +43,8 @@
     xft = enableX11;
     cairo = true;
   },
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   cairo,
   # List of external tools to create, this default list includes all default
   # tools, as recorded on release 3.9.3.
@@ -134,10 +134,10 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
   ]
   ++ lib.optionals enableTypeEngines.xcore [
-    libX11
+    libx11
   ]
   ++ lib.optionals enableTypeEngines.xft [
-    libXft
+    libxft
   ]
   ++ lib.optionals enableTypeEngines.cairo [
     cairo
diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix
index ef442ca930a7..1705496ec0c2 100644
--- a/pkgs/by-name/ml/mlvwm/package.nix
+++ b/pkgs/by-name/ml/mlvwm/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   gccmakedep,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   imake,
   installShellFiles,
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gccmakedep
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     imake
   ];
 
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index c6485a846c2b..1312e6132f3f 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -26,11 +26,11 @@
   libuv,
   libuvc,
   libv4l,
-  libXau,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXext,
-  libXrandr,
+  libxdmcp,
+  libxext,
+  libxrandr,
   nix-update-script,
   onnxruntime,
   opencv4,
@@ -108,11 +108,11 @@ stdenv.mkDerivation (finalAttrs: {
     libuv
     libuvc
     libv4l
-    libXau
+    libxau
     libxcb
-    libXdmcp
-    libXext
-    libXrandr
+    libxdmcp
+    libxext
+    libxrandr
     onnxruntime
     opencv4
     openvr
diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 0c32c4b96592..b97182b23ccb 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   pkg-config,
   boost186,
@@ -40,13 +39,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.4";
+  version = "0.18.4.5";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-NH15PKlkm9Hpt25iIuUQmhDg+X3Qo+yUAbDY4LNnZdM=";
+    hash = "sha256-8ObxMPBpH5uonpb7E/PEfuq++7R4MU0k1khsott5J88=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index 93441d2028c5..efc61cd2ab54 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.4";
+  version = "0.18.4.5";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-5jtGC0G6M3zEMedLSNIllNjpFPMEAG/5NxvnCxqO9gI=";
+    hash = "sha256-K275qry6PWeEh3g0EofkD8E4pO5uWGFoAGzdkj9kuvA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index bd7e3ef456a8..e3b051b9faf2 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -7,18 +7,18 @@
   pkg-config,
   libtool,
   xbitmaps,
-  libXext,
-  libXft,
-  libXrender,
-  libXmu,
-  libXt,
+  libxext,
+  libxft,
+  libxrender,
+  libxmu,
+  libxt,
   expat,
   libjpeg,
   libpng,
   libiconv,
   flex,
-  libXp,
-  libXau,
+  libxp,
+  libxau,
   demoSupport ? false,
 }:
 # refer to the gentoo package
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
     flex
     libtool
     xbitmaps
-    libXext
-    libXft
-    libXrender
-    libXmu
-    libXt
+    libxext
+    libxft
+    libxrender
+    libxmu
+    libxt
     expat
     libjpeg
     libpng
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    libXp
-    libXau
+    libxp
+    libxau
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index ed2e60f79afb..0c284d120cce 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -11,7 +11,7 @@
 
   pkg-config,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   libevdev,
   udevCheckHook,
   gtk3,
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     # Base deps
-    libXtst
+    libxtst
     libevdev
 
     # Tauri deps
diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix
index ac712cf10a92..8bad10e3929a 100644
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@@ -3,9 +3,9 @@
   fetchFromGitHub,
   rustPlatform,
   pkg-config,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   libevdev,
   udevCheckHook,
 }:
@@ -26,9 +26,9 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
 
   buildInputs = [
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     libevdev
   ];
 
diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix
index 8a2b23539cfc..12e8be4d619f 100644
--- a/pkgs/by-name/mo/movit/package.nix
+++ b/pkgs/by-name/mo/movit/package.nix
@@ -9,7 +9,7 @@
   eigen,
   libepoxy,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     fftw
     gtest
     libGL
-    libX11
+    libx11
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 19b44bbc49a6..bb33b4791262 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -13,11 +13,11 @@
   freetype,
   lcms2,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXext,
-  libXpresent,
-  libXrandr,
+  libx11,
+  libxscrnsaver,
+  libxext,
+  libxpresent,
+  libxrandr,
   libarchive,
   libass,
   libbluray,
@@ -217,12 +217,12 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
   ]
   ++ lib.optionals x11Support [
-    libX11
-    libXext
+    libx11
+    libxext
     libGL
-    libXrandr
-    libXpresent
-    libXScrnSaver
+    libxrandr
+    libxpresent
+    libxscrnsaver
   ]
   ++ lib.optionals zimgSupport [ zimg ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ];
diff --git a/pkgs/by-name/mr/mrtrix/package.nix b/pkgs/by-name/mr/mrtrix/package.nix
index 07345b1933ad..1936641b9e44 100644
--- a/pkgs/by-name/mr/mrtrix/package.nix
+++ b/pkgs/by-name/mr/mrtrix/package.nix
@@ -14,8 +14,8 @@
   qt5,
   libGL,
   libGLU,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   less,
   withGui ? true,
 }:
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withGui [
     libGL
     libGLU
-    libX11
-    libXext
+    libx11
+    libxext
     qt5.qtbase
     qt5.qtsvg
   ];
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index eac0caef6cee..ced42dbf9e84 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -22,9 +22,9 @@
   libstartup_notification,
   libwacom,
   libxcvt,
-  libXdamage,
+  libxdamage,
   libxkbcommon,
-  libXtst,
+  libxtst,
   mesa-gl-headers,
   meson,
   ninja,
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     libstartup_notification
     libwacom
     libxcvt
-    libXdamage
+    libxdamage
     libxkbcommon
     pipewire
     udev
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     # required for pkg-config to detect muffin-clutter
     json-glib
-    libXtst
+    libxtst
     graphene
     mesa-gl-headers
   ];
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 0328a37e924c..6a7ce182683d 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -21,11 +21,11 @@
   glib,
   gtk3,
   libxcb,
-  libX11,
-  libXext,
-  libXrender,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxrender,
+  libxt,
+  libxtst,
   libgbm,
   pango,
   pciutils,
@@ -73,11 +73,11 @@ let
       glib
       gtk3
       libxcb
-      libX11
-      libXext
-      libXrender
-      libXt
-      libXtst
+      libx11
+      libxext
+      libxrender
+      libxt
+      libxtst
       libgbm
       pango
       pciutils
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   # Firefox uses "relrhack" to manually process relocations from a fixed offset
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index 04ceaa43ed4a..0aa1fa6efe24 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libpulseaudio,
-  libX11,
+  libx11,
   makeWrapper,
   sox,
   fetchpatch,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
-    libX11
+    libx11
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mu/mup/package.nix b/pkgs/by-name/mu/mup/package.nix
index 6942b8bff92a..280e8d9ec1ed 100644
--- a/pkgs/by-name/mu/mup/package.nix
+++ b/pkgs/by-name/mu/mup/package.nix
@@ -9,8 +9,8 @@
   groff,
   netpbm,
   fltk,
-  libXinerama,
-  libXpm,
+  libxinerama,
+  libxpm,
   libjpeg,
 }:
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     fltk
-    libXinerama
-    libXpm
+    libxinerama
+    libxpm
     libjpeg
   ];
 
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 8c0df93dd008..8decbcb600dd 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -17,10 +17,10 @@
   libjpeg,
   gumbo,
   enableX11 ? (!stdenv.hostPlatform.isDarwin),
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
   enableCurl ? true,
   curl,
   openssl,
@@ -147,10 +147,10 @@ stdenv.mkDerivation rec {
     gumbo
   ]
   ++ lib.optionals enableX11 [
-    libX11
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxext
+    libxi
+    libxrandr
   ]
   ++ lib.optionals enableCurl [
     curl
diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix
index 4700710bd4a6..da19784ff502 100644
--- a/pkgs/by-name/mu/mupen64plus/package.nix
+++ b/pkgs/by-name/mu/mupen64plus/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Remove unused SDL2 header that erroneously adds libX11 dependency
+    # Remove unused SDL2 header that erroneously adds libx11 dependency
     ./remove-unused-header.patch
   ];
 
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index c99e4a7ca42d..f7d4af0e6e87 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -6,10 +6,10 @@
   fontconfig,
   zlib,
   icu,
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
   libice,
   libsm,
   openssl,
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     icu
-    libX11
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxext
+    libxi
+    libxrandr
     libice
     libsm
     openssl
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index b070d0e0a709..d5c70318d9b5 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -19,19 +19,19 @@
   libadwaita,
   libxcvt,
   libGL,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   xkeyboard_config,
   libxkbcommon,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXau,
+  libxrandr,
+  libxinerama,
+  libxau,
   libinput,
   libdrm,
   libgbm,
@@ -161,19 +161,19 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     # X11 client
     gtk4
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     xkeyboard_config
     libxkbcommon
     libxcb
-    libXrandr
-    libXinerama
-    libXau
+    libxrandr
+    libxinerama
+    libxau
 
     # for gdctl and gnome-service-client shebangs
     (python3.withPackages (pp: [
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index f52fdde8852a..c7e82ef4e7a6 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -19,21 +19,21 @@
   libxcvt,
   libGL,
   libice,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxtst,
   libxkbfile,
   xkeyboard_config,
   libxkbcommon,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXau,
+  libxrandr,
+  libxinerama,
+  libxau,
   libinput,
   libdrm,
   libgbm,
@@ -159,21 +159,21 @@ stdenv.mkDerivation (finalAttrs: {
     # X11 client
     gtk4
     libice
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxtst
     libxkbfile
     xkeyboard_config
     libxkbcommon
     libxcb
-    libXrandr
-    libXinerama
-    libXau
+    libxrandr
+    libxinerama
+    libxau
 
     # for gdctl shebang
     (python3.withPackages (pp: [
diff --git a/pkgs/by-name/my/mygui/package.nix b/pkgs/by-name/my/mygui/package.nix
index 2bf15b582ceb..11d724fafad1 100644
--- a/pkgs/by-name/my/mygui/package.nix
+++ b/pkgs/by-name/my/mygui/package.nix
@@ -13,7 +13,7 @@
   ogre,
   libGL,
   libGLU,
-  libX11,
+  libx11,
 }:
 
 let
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   # Tools are disabled due to compilation failures.
diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix
index 7bdcdad85e25..47f539375b6f 100644
--- a/pkgs/by-name/na/nas/package.nix
+++ b/pkgs/by-name/na/nas/package.nix
@@ -6,11 +6,11 @@
   flex,
   gccmakedep,
   imake,
-  libXau,
-  libXaw,
-  libXext,
-  libXpm,
-  libXt,
+  libxau,
+  libxaw,
+  libxext,
+  libxpm,
+  libxt,
   xorg-cf-files,
   xorgproto,
 }:
@@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXau
-    libXaw
-    libXext
-    libXpm
-    libXt
+    libxau
+    libxaw
+    libxext
+    libxpm
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index 6f6ef0986194..256433776093 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -15,7 +15,7 @@
   glibc,
   harfbuzz,
   libGL,
-  libX11,
+  libx11,
   libgpg-error,
   libselinux,
   libxcb,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     glibc
     harfbuzz
     libGL
-    libX11
+    libx11
     libgpg-error
     libselinux
     libxcb
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
           glibc
           harfbuzz
           libGL
-          libX11
+          libx11
           libgpg-error
           libselinux
           libxcb
diff --git a/pkgs/by-name/ne/nedit/package.nix b/pkgs/by-name/ne/nedit/package.nix
index 81182fbc6a04..93f45ad00070 100644
--- a/pkgs/by-name/ne/nedit/package.nix
+++ b/pkgs/by-name/ne/nedit/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   motif,
-  libXpm,
-  libXt,
+  libxpm,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     motif
-    libXpm
-    libXt
+    libxpm
+    libxt
   ];
 
   # the linux config works fine on darwin too!
diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix
index 01833a78b437..01e133723568 100644
--- a/pkgs/by-name/ne/neowall/package.nix
+++ b/pkgs/by-name/ne/neowall/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   lib,
   libGL,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libpng,
   libjpeg,
   wayland,
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     wayland
     wayland-protocols
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     libGL
     libpng
     libjpeg
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 83aa10953964..e9bb20998dd4 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.27.1";
+  version = "2.31.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-XVB3zgdfgApqNwMdZMung4qLZOPfsaWdpqlFUz5z9ZU=";
+    hash = "sha256-vpxMPoF0xn5UzY1Yo5Y2NAfmwC21Z6Ogv+C30JKyj0E=";
   };
 
-  npmDepsHash = "sha256-e4Uxy1bwR3a+thIkaNWpAwDvIJyTbM5TwVy+YVD0CQQ=";
+  npmDepsHash = "sha256-IyNVeoEusQlxOYzYe9xIwtHepDRyjUfKHGNNR8LoOSA=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 8fe4a576c4ae..904557bf3060 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -9,9 +9,9 @@
   pkg-config,
   gtk3,
   libayatana-appindicator,
-  libX11,
-  libXcursor,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxxf86vm,
   versionCheckHook,
   netbird-management,
   netbird-relay,
@@ -84,9 +84,9 @@ buildGoModule (finalAttrs: {
   buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && componentName == "ui") [
     gtk3
     libayatana-appindicator
-    libX11
-    libXcursor
-    libXxf86vm
+    libx11
+    libxcursor
+    libxxf86vm
   ];
 
   subPackages = [ component.module ];
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 645aba44e5d1..939ed9b7abb2 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libX11,
+  libx11,
   stdenv,
 }:
 
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-OzIp6tVVVh4xWuzaGI4FasCz5dMZQmRxeLqZhg/AgN0=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;
+  buildInputs = lib.optional stdenv.hostPlatform.isLinux libx11;
 
   meta = {
     description = "Automated WireGuard® Management Client";
diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix
index 4f1f7b44ccc2..e8bfefd11403 100644
--- a/pkgs/by-name/ne/nethack/package.nix
+++ b/pkgs/by-name/ne/nethack/package.nix
@@ -12,9 +12,9 @@
   buildPackages,
   x11Mode ? false,
   qtMode ? false,
-  libXaw,
-  libXext,
-  libXpm,
+  libxaw,
+  libxext,
+  libxpm,
   bdftopcf,
   mkfontdir,
   pkg-config,
@@ -76,9 +76,9 @@ stdenvUsed.mkDerivation (finalAttrs: {
     ncurses
   ]
   ++ lib.optionals x11Mode [
-    libXaw
-    libXext
-    libXpm
+    libxaw
+    libxext
+    libxpm
   ]
   ++ lib.optionals qtMode [
     gzip
diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index e54e394c85e0..34c9c7de91fb 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -13,7 +13,7 @@
   makeWrapper,
   libtiff,
   enableX11 ? false,
-  libX11,
+  libx11,
   buildPackages,
 }:
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     jbigkit
   ]
-  ++ lib.optional enableX11 libX11;
+  ++ lib.optional enableX11 libx11;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ne/netsurf-browser/package.nix b/pkgs/by-name/ne/netsurf-browser/package.nix
index 48529d3c09c1..3b1c8b8932a0 100644
--- a/pkgs/by-name/ne/netsurf-browser/package.nix
+++ b/pkgs/by-name/ne/netsurf-browser/package.nix
@@ -9,8 +9,8 @@
   gperf,
   gtk2,
   gtk3,
-  libXcursor,
-  libXrandr,
+  libxcursor,
+  libxrandr,
   libidn,
   libjpeg,
   libjxl,
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     check
     curl
     gperf
-    libXcursor
-    libXrandr
+    libxcursor
+    libxrandr
     libidn
     libjpeg
     libjxl
diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix
index 4f048d68a04b..580e67bfbaca 100644
--- a/pkgs/by-name/ne/neverball/package.nix
+++ b/pkgs/by-name/ne/neverball/package.nix
@@ -7,7 +7,7 @@
   libGL,
   libpng,
   libjpeg,
-  libX11,
+  libx11,
   SDL2_ttf,
   libvorbis,
   gettext,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     physfs
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
   ];
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/ne/nexuiz/package.nix b/pkgs/by-name/ne/nexuiz/package.nix
index 7a608b453b8d..33a11b640692 100644
--- a/pkgs/by-name/ne/nexuiz/package.nix
+++ b/pkgs/by-name/ne/nexuiz/package.nix
@@ -13,13 +13,13 @@
   libogg,
   libmodplug,
   # glx
-  libX11,
+  libx11,
   libGLU,
   libGL,
-  libXpm,
-  libXext,
-  libXxf86vm,
-  libXxf86dga,
+  libxpm,
+  libxext,
+  libxxf86vm,
+  libxxf86dga,
   alsa-lib,
   # sdl
   SDL,
@@ -48,13 +48,13 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     # glx
-    libX11
+    libx11
     libGLU
     libGL
-    libXpm
-    libXext
-    libXxf86vm
-    libXxf86dga
+    libxpm
+    libxext
+    libxxf86vm
+    libxxf86dga
     alsa-lib
     # sdl
     SDL
diff --git a/pkgs/by-name/ni/nice-dcv-client/package.nix b/pkgs/by-name/ni/nice-dcv-client/package.nix
index 21e6ca1f9f54..f27c4c5b6fb9 100644
--- a/pkgs/by-name/ni/nice-dcv-client/package.nix
+++ b/pkgs/by-name/ni/nice-dcv-client/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   glib,
-  libX11,
+  libx11,
   gst_all_1,
   libepoxy,
   pango,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     libxml2
     libva
     e2fsprogs
-    libX11
+    libx11
     openssl
     pcsclite
     gtk3
diff --git a/pkgs/by-name/no/noriskclient-launcher/package.nix b/pkgs/by-name/no/noriskclient-launcher/package.nix
index 19dfce8d4c5a..9bd592d1f03e 100644
--- a/pkgs/by-name/no/noriskclient-launcher/package.nix
+++ b/pkgs/by-name/no/noriskclient-launcher/package.nix
@@ -17,11 +17,11 @@
   libGL,
   libjack2,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
   noriskclient-launcher-unwrapped,
   pipewire,
   stdenv,
@@ -54,11 +54,11 @@ symlinkJoin {
 
       # glfw
       libGL
-      libX11
-      libXcursor
-      libXext
-      libXrandr
-      libXxf86vm
+      libx11
+      libxcursor
+      libxext
+      libxrandr
+      libxxf86vm
 
       # narrator support
       flite
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index fd823a4bd993..60993705765a 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -7,11 +7,11 @@
   gettext,
   groff,
   libsm,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
   lua,
   makeWrapper,
   pkg-config,
@@ -51,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     libsm
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrandr
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrandr
     lua
     readline
   ];
diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix
index b067bfb29ad9..5525d71aa349 100644
--- a/pkgs/by-name/np/np2kai/package.nix
+++ b/pkgs/by-name/np/np2kai/package.nix
@@ -10,7 +10,7 @@
   glib,
   gtk2,
   libusb1,
-  libX11,
+  libx11,
   openssl,
   pkg-config,
   SDL2,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     glib
     gtk2
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index 6cfd8644b8af..f5742eff6f31 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -4,7 +4,7 @@
   fetchFromCodeberg,
   giflib,
   imlib2Full,
-  libXft,
+  libxft,
   libexif,
   libwebp,
   libinotify-kqueue,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     giflib
     imlib2Full
-    libXft
+    libxft
     libexif
     libwebp
   ]
diff --git a/pkgs/by-name/nt/ntk/package.nix b/pkgs/by-name/nt/ntk/package.nix
index 518ab796b8f7..8aa84895cac5 100644
--- a/pkgs/by-name/nt/ntk/package.nix
+++ b/pkgs/by-name/nt/ntk/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cairo,
   libjpeg,
-  libXft,
+  libxft,
   pkg-config,
   python3,
   wafHook,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libjpeg
-    libXft
+    libxft
     python3
   ];
 
diff --git a/pkgs/by-name/nu/numlockx/package.nix b/pkgs/by-name/nu/numlockx/package.nix
index 9c50ce5d7c82..c02817dae95f 100644
--- a/pkgs/by-name/nu/numlockx/package.nix
+++ b/pkgs/by-name/nu/numlockx/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   autoconf,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation {
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     autoconf
   ];
 
diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix
index af6c19cfef97..7ef2f8822e9e 100644
--- a/pkgs/by-name/nw/nwg-look/package.nix
+++ b/pkgs/by-name/nw/nwg-look/package.nix
@@ -8,7 +8,7 @@
   cairo,
   gtk3,
   xcur2png,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -39,7 +39,7 @@ buildGoModule rec {
     glib
     cairo
     xcur2png
-    libX11.dev
+    libx11.dev
     zlib
     gtk3
   ];
diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix
index d1191f8acb6c..c0e1e4e98c40 100644
--- a/pkgs/by-name/oc/ocelot-desktop/package.nix
+++ b/pkgs/by-name/oc/ocelot-desktop/package.nix
@@ -15,11 +15,11 @@
   libpulseaudio,
   pipewire,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
 
   # runtime (path)
   xrandr,
@@ -63,11 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
 
         # lwjgl
         libGL
-        libX11
-        libXcursor
-        libXext
-        libXrandr
-        libXxf86vm
+        libx11
+        libxcursor
+        libxext
+        libxrandr
+        libxxf86vm
       ];
       runtimePrograms = lib.optionals stdenv.hostPlatform.isLinux [
         # https://github.com/LWJGL/lwjgl/issues/128
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 747f389c98f7..1d13a79da25f 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -7,10 +7,10 @@
   openssl,
   fontconfig,
   nasm,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
   libGL,
   libxkbcommon,
   wayland,
@@ -51,10 +51,10 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     gtk3
     libxkbcommon
     wayland
diff --git a/pkgs/by-name/od/odin2/package.nix b/pkgs/by-name/od/odin2/package.nix
index 29fd530cf778..b155af5d7573 100644
--- a/pkgs/by-name/od/odin2/package.nix
+++ b/pkgs/by-name/od/odin2/package.nix
@@ -8,11 +8,11 @@
   freetype,
   libjack2,
   lv2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libGL,
   gcc-unwrapped,
   copyDesktopItems,
@@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libjack2
     lv2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libGL
   ];
 
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index 496984eb0178..26cfeef71534 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -11,14 +11,14 @@
   godot3-export-templates,
   godot3-headless,
   libGLU,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   libpulseaudio,
   perl,
@@ -48,14 +48,14 @@ stdenv.mkDerivation rec {
     gcc-unwrapped.lib
     git
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     libpulseaudio
     perl
diff --git a/pkgs/by-name/oi/oilrush/package.nix b/pkgs/by-name/oi/oilrush/package.nix
index e68c990512be..b7ead76c4a7b 100644
--- a/pkgs/by-name/oi/oilrush/package.nix
+++ b/pkgs/by-name/oi/oilrush/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   config,
   fetchurl,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxrender,
   fontconfig,
   freetype,
   openal,
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -62,9 +62,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -75,9 +75,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -90,20 +90,20 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXinerama
-        libXrandr
+        libx11
+        libxext
+        libxinerama
+        libxrandr
       ]
     }\
              libUnigine_$arch.so
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXinerama
-        libXrandr
+        libx11
+        libxext
+        libxinerama
+        libxrandr
       ]
     }\
              OilRush_$arch
diff --git a/pkgs/by-name/oi/ois/package.nix b/pkgs/by-name/oi/ois/package.nix
index e34157871dd4..e619fa6f72ad 100644
--- a/pkgs/by-name/oi/ois/package.nix
+++ b/pkgs/by-name/oi/ois/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix
index d1f591ec3938..31a93fe6ce18 100644
--- a/pkgs/by-name/ol/olvid/package.nix
+++ b/pkgs/by-name/ol/olvid/package.nix
@@ -3,11 +3,11 @@
   lib,
   fetchurl,
   zlib,
-  libXext,
-  libX11,
-  libXrender,
-  libXtst,
-  libXi,
+  libxext,
+  libx11,
+  libxrender,
+  libxtst,
+  libxi,
   freetype,
   alsa-lib,
   jdk21,
@@ -80,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
-    libXext
-    libX11
-    libXrender
-    libXtst
-    libXi
+    libxext
+    libx11
+    libxrender
+    libxtst
+    libxi
     freetype
     alsa-lib
   ];
diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix
index 8eae793e0dec..c43f40b3fac6 100644
--- a/pkgs/by-name/on/oneko/package.nix
+++ b/pkgs/by-name/on/oneko/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index cede42911834..8d0823306974 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -16,13 +16,13 @@
   procps,
   libtirpc,
   rpcsvc-proto,
-  libX11,
-  libXext,
-  libXinerama,
-  libXi,
-  libXrender,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxext,
+  libxinerama,
+  libxi,
+  libxrender,
+  libxrandr,
+  libxtst,
   libxcrypt,
   libxml2,
   pkg-config,
@@ -98,13 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf-xlib
     gtk3
     gtkmm3
-    libX11
-    libXext
-    libXinerama
-    libXi
-    libXrender
-    libXrandr
-    libXtst
+    libx11
+    libxext
+    libxinerama
+    libxi
+    libxrender
+    libxrandr
+    libxtst
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index aca2c8584063..6b9a6c5cf908 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.4.4";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V3lYm+FWqy0x7dTIE/Ii6W29BlspwBLlFFVIyohZzE8=";
+    hash = "sha256-4w+CkYhFS/P9ZeHiR2daK+DujqCKzF/aUAZbMcHqvyk=";
   };
 
-  vendorHash = "sha256-JlUvnY5UlIuSxjtejjIcQTwFdQcMJrRWH5qNKIio2Jo=";
+  vendorHash = "sha256-3QNiw3q0dhgWeGFBq4a5GCE3bIIa4YiJRKMU+Hakvx0=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index cfb8e311e1cd..0a6e634e2b5e 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   offlineCache = yarn.fetchYarnBerryDeps {
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU=";
+    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index 5117c2e7f18f..7af17060a913 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -22,8 +22,8 @@
   lame,
   fdk_aac,
   libass,
-  libXext,
-  libXfixes,
+  libxext,
+  libxfixes,
 }:
 
 let
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     fdk_aac
     libass
     quazip
-    libXext
-    libXfixes
+    libxext
+    libxfixes
   ];
 
   meta = {
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 0929d85f8aef..bf1f1f274351 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -7,10 +7,10 @@
   pkg-config,
   python3,
   libxml2,
-  libXinerama,
-  libXcursor,
-  libXau,
-  libXrandr,
+  libxinerama,
+  libxcursor,
+  libxau,
+  libxrandr,
   libice,
   libsm,
   imlib2,
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxml2
-    libXinerama
-    libXcursor
-    libXau
-    libXrandr
+    libxinerama
+    libxcursor
+    libxau
+    libxrandr
     libice
     libsm
     libstartup_notification
diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix
index 72f84459a5f4..18ec7d85ef52 100644
--- a/pkgs/by-name/op/opencascade-occt/package.nix
+++ b/pkgs/by-name/op/opencascade-occt/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fetchpatch,
   cmake,
   ninja,
@@ -10,39 +10,39 @@
   tk,
   libGL,
   libGLU,
-  libXext,
-  libXmu,
-  libXi,
+  libxext,
+  libxmu,
+  libxi,
   vtk,
   withVtk ? false,
-
-  # used in passthru.tests
   opencascade-occt,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opencascade-occt";
-  version = "7.8.1";
-  commit = "V${builtins.replaceStrings [ "." ] [ "_" ] version}";
+  version = "7.9.3";
 
-  src = fetchurl {
-    name = "occt-${commit}.tar.gz";
-    url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
-    hash = "sha256-AGMZqTLLjXbzJFW/RSTsohAGV8sMxlUmdU/Y2oOzkk8=";
+  src = fetchFromGitHub {
+    owner = "Open-Cascade-SAS";
+    repo = "OCCT";
+    tag = "V${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-Zp4m+f1wrzynoCrzIwvYELUXsY/NQIBY+HFk5UteufI=";
   };
 
-  patches = [
+  patches = lib.optionals (lib.versionOlder finalAttrs.version "7.9") [
     # fix compilation on darwin against latest version of freetype
     # https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/330
     (fetchpatch {
       url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
       hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
     })
-
-    # patch does not apply against 7.9+, it was submitted upstream for future
-    # inclusion: https://github.com/Open-Cascade-SAS/OCCT/pull/683
-    ./vtk-draw-conditional-glx.patch
   ];
 
+  # Exclude TKIVtkDraw toolkits cause VTK has no glx support on darwin
+  postPatch = lib.optionalString (withVtk && stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace adm/MODULES \
+      --replace-fail "TKIVtkDraw" ""
+  '';
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
     tk
     libGL
     libGLU
-    libXext
-    libXmu
-    libXi
+    libxext
+    libxmu
+    libxi
     rapidjson
   ]
   ++ lib.optional withVtk vtk;
@@ -89,4 +89,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ amiloradovsky ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch b/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch
deleted file mode 100644
index 76993ae6046f..000000000000
--- a/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 86905287dc..19214e8f2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -623,5 +623,9 @@ if (USE_VTK)
-   add_definitions (-DHAVE_VTK)
-   set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
-   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
-+  if (DEFINED VTK_USE_X AND NOT VTK_USE_X)
-+      message (STATUS "Info: TKIVtkDraw toolkits excluded due to VTK has no glx support")
-+      list (REMOVE_ITEM BUILD_TOOLKITS TKIVtkDraw)
-+  endif()
- else()
-   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
diff --git a/pkgs/by-name/op/opencsg/package.nix b/pkgs/by-name/op/opencsg/package.nix
index e7c97b1efdd6..134d6af97caf 100644
--- a/pkgs/by-name/op/opencsg/package.nix
+++ b/pkgs/by-name/op/opencsg/package.nix
@@ -7,9 +7,9 @@
   libGL,
   libglut,
   glew,
-  libXmu,
-  libXext,
-  libX11,
+  libxmu,
+  libxext,
+  libx11,
   fixDarwinDylibNames,
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     libglut
-    libXmu
-    libXext
-    libX11
+    libxmu
+    libxext
+    libx11
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix
index 60750ff5d4d6..53013299c158 100644
--- a/pkgs/by-name/op/opengothic/package.nix
+++ b/pkgs/by-name/op/opengothic/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   glslang,
   lib,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libglvnd,
   makeWrapper,
   ninja,
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libglvnd
     vulkan-headers
     vulkan-loader
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index d8521cfc1268..3cd764dfda16 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -15,8 +15,8 @@
 
   gtk2,
   gtk3,
-  libXtst,
-  libXxf86vm,
+  libxtst,
+  libxxf86vm,
   glib,
   alsa-lib,
   ffmpeg_7,
@@ -107,8 +107,8 @@ stdenv.mkDerivation {
   buildInputs = [
     gtk2
     gtk3
-    libXtst
-    libXxf86vm
+    libxtst
+    libxxf86vm
     glib
     alsa-lib
     (if atLeast21 then ffmpeg_7 else ffmpeg_7-headless)
diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix
index bd40403d56e7..aa4d8c125669 100644
--- a/pkgs/by-name/op/openjk/package.nix
+++ b/pkgs/by-name/op/openjk/package.nix
@@ -9,7 +9,7 @@
   zlib,
   libpng,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   unstableGitUpdater,
 }:
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     zlib
     libpng
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index 471d8986e18a..b45e72e2418a 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   curl,
   gd,
-  libX11,
+  libx11,
   libxml2,
   libzip,
   SDL,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     gd
-    libX11
+    libx11
     libxml2
     libzip
     SDL
diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix
index 734522bea203..89e0ff2e760d 100644
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@@ -15,7 +15,7 @@
   libpng,
   libtheora,
   libvorbis,
-  libX11,
+  libx11,
   python3,
   tcl,
   zlib,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     SDL2_ttf
-    libX11
+    libx11
     alsa-lib
     freetype
     glew
diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix
index f3f3a15aece9..4e723af9d831 100644
--- a/pkgs/by-name/op/openmw/package.nix
+++ b/pkgs/by-name/op/openmw/package.nix
@@ -10,7 +10,7 @@
   cmake,
   collada-dom,
   ffmpeg,
-  libXt,
+  libxt,
   lua,
   luajit,
   lz4,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     collada-dom
     ffmpeg
-    libXt
+    libxt
     (if isAarch64Linux then lua else luajit)
     lz4
     mygui
diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix
index 9b847782b465..70ad5386fb75 100644
--- a/pkgs/by-name/op/openrw/package.nix
+++ b/pkgs/by-name/op/openrw/package.nix
@@ -16,7 +16,7 @@
   libGL,
   libGLU,
   libmad,
-  libX11,
+  libx11,
   openal,
 
   unstableGitUpdater,
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libmad
-    libX11
+    libx11
     openal
   ];
 
diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix
index bd4183cec054..5487b6ef17d7 100644
--- a/pkgs/by-name/op/opensc/package.nix
+++ b/pkgs/by-name/op/opensc/package.nix
@@ -10,7 +10,7 @@
   libiconv,
   pcsclite,
   libassuan,
-  libXt,
+  libxt,
   docbook_xsl,
   libxslt,
   docbook_xml_dtd_412,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     readline
     openssl
     libassuan
-    libXt
+    libxt
     libiconv
     docbook_xml_dtd_412
   ]
diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix
index a06eefd84fac..95e35c44172c 100644
--- a/pkgs/by-name/op/openscenegraph/package.nix
+++ b/pkgs/by-name/op/openscenegraph/package.nix
@@ -7,9 +7,9 @@
   cmake,
   pkg-config,
   doxygen,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
   libGLU,
   libGL,
   glib,
@@ -79,9 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXinerama
-      libXrandr
+      libx11
+      libxinerama
+      libxrandr
       libGLU
       libGL
     ]
diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix
index d71d264e5d20..4379fbe12e2c 100644
--- a/pkgs/by-name/op/openspades/package.nix
+++ b/pkgs/by-name/op/openspades/package.nix
@@ -19,7 +19,7 @@
   openal,
   opusfile,
   libogg,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     opusfile
     openal
     libogg
-    libXext
+    libxext
   ];
 
   patches = [
diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 04a3730acb58..f3b81bd51a94 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -10,8 +10,8 @@
   libappindicator,
   libevdev,
   libnotify,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   makeDesktopItem,
   nixosTests,
   udev,
@@ -60,8 +60,8 @@ buildDotnetModule (finalAttrs: {
     libappindicator
     libevdev
     libnotify
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     udev
   ];
 
diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index ff563f2c97bb..3f0e59c1947a 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -12,7 +12,7 @@
   opencv4,
   procps,
   eigen,
-  libXdmcp,
+  libxdmcp,
   libevdev,
   makeDesktopItem,
   wineWowPackages,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     finalAttrs.aruco
     eigen
-    libXdmcp
+    libxdmcp
     libevdev
     onnxruntime
     opencv4
diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix
index f4d23ff32d6e..c6cd7004a650 100644
--- a/pkgs/by-name/op/openutau/package.nix
+++ b/pkgs/by-name/op/openutau/package.nix
@@ -8,7 +8,7 @@
   dbus,
   fontconfig,
   portaudio,
-  libXi,
+  libxi,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -61,7 +61,7 @@ buildDotnetModule rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     fontconfig
-    libXi
+    libxi
   ];
 
   dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index 3b9232e3934a..12cb9367e534 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   cmake,
   python3,
-  libX11,
-  libXxf86vm,
-  libXrandr,
+  libx11,
+  libxxf86vm,
+  libxrandr,
   vulkan-headers,
   libGL,
   vulkan-loader,
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXxf86vm
-    libXrandr
+    libx11
+    libxxf86vm
+    libxrandr
     wayland
   ];
 
diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 0c40e5df6095..86d9bf8368e8 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   alsa-lib,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix
index 527f94a2dbc4..100b5810e37d 100644
--- a/pkgs/by-name/ou/outfly/package.nix
+++ b/pkgs/by-name/ou/outfly/package.nix
@@ -9,10 +9,10 @@
   libGL,
   vulkan-loader,
   wayland,
-  libXrandr,
-  libXcursor,
-  libX11,
-  libXi,
+  libxrandr,
+  libxcursor,
+  libx11,
+  libxi,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,15 +28,15 @@ rustPlatform.buildRustPackage rec {
   runtimeInputs = [
     libxkbcommon
     libGL
-    libXrandr
-    libX11
+    libxrandr
+    libx11
     vulkan-loader
   ];
 
   buildInputs = [
     alsa-lib.dev
-    libXcursor
-    libXi
+    libxcursor
+    libxi
     wayland
   ];
 
diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
index 54d4ff87250c..d2e6eea997d8 100644
--- a/pkgs/by-name/ox/oxefmsynth/package.nix
+++ b/pkgs/by-name/ox/oxefmsynth/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
+  libx11,
   vst2-sdk,
 }:
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "VSTSDK_PATH=${vst2-sdk}" ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     mkdir -p $out/lib/lxvst
diff --git a/pkgs/by-name/ox/oxwm/package.nix b/pkgs/by-name/ox/oxwm/package.nix
index e9de0f4fa38c..9f33f1a1b745 100644
--- a/pkgs/by-name/ox/oxwm/package.nix
+++ b/pkgs/by-name/ox/oxwm/package.nix
@@ -3,9 +3,9 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXft,
-  libXrender,
+  libx11,
+  libxft,
+  libxrender,
   freetype,
   fontconfig,
   versionCheckHook,
@@ -26,9 +26,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrender
+    libx11
+    libxft
+    libxrender
     freetype
     fontconfig
   ];
diff --git a/pkgs/by-name/pa/pa_applet/package.nix b/pkgs/by-name/pa/pa_applet/package.nix
index 227f1bdd374b..c32aabca6e67 100644
--- a/pkgs/by-name/pa/pa_applet/package.nix
+++ b/pkgs/by-name/pa/pa_applet/package.nix
@@ -9,7 +9,7 @@
   autoconf,
   automake,
   libnotify,
-  libX11,
+  libx11,
   xf86-input-evdev,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     libpulseaudio
     glibc
     libnotify
-    libX11
+    libx11
     xf86-input-evdev
   ];
 
diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index 15951f311426..0f6edca0299a 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -18,7 +18,7 @@
   python3,
   docutils,
   x11Support ? !stdenv.hostPlatform.isDarwin,
-  libXft,
+  libxft,
   withIntrospection ?
     lib.meta.availableOn stdenv.hostPlatform gobject-introspection
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
   ]
   ++ lib.optionals x11Support [
-    libXft
+    libxft
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix
index 8330fce65dea..174f9bd2065a 100644
--- a/pkgs/by-name/pa/paperview/package.nix
+++ b/pkgs/by-name/pa/paperview/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   SDL2,
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix
index 9be4f86eb3e9..15a4ac9cf02b 100644
--- a/pkgs/by-name/pa/pappl/package.nix
+++ b/pkgs/by-name/pa/pappl/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pappl";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "pappl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XHFYwl129iD5rKC1P/roFlX+03uFE8ofwQRIEkUuOCc=";
+    hash = "sha256-nSjJLmkM730edY+rzxY7JSvwJoQdJiW/XBBsD+TY2ys=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix
index 1c46403914c6..4f0c3f7f6f8c 100644
--- a/pkgs/by-name/pa/pari/package.nix
+++ b/pkgs/by-name/pa/pari/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   gmp,
-  libX11,
+  libx11,
   libpthread-stubs,
   perl,
   readline,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gmp
-    libX11
+    libx11
     perl
     readline
     texliveBasic
diff --git a/pkgs/by-name/pa/parole/package.nix b/pkgs/by-name/pa/parole/package.nix
index f3a5c0de09ae..27de3d3d79d8 100644
--- a/pkgs/by-name/pa/parole/package.nix
+++ b/pkgs/by-name/pa/parole/package.nix
@@ -12,7 +12,7 @@
   glib,
   gtk3,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   taglib,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     libnotify
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     taglib
diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix
index 059c5938036d..30e8b651e70b 100644
--- a/pkgs/by-name/pc/pcl/package.nix
+++ b/pkgs/by-name/pc/pcl/package.nix
@@ -11,7 +11,7 @@
 
   # buildInputs
   eigen,
-  libXt,
+  libxt,
   libpcap,
   libusb1,
   llvmPackages,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     eigen
-    libXt
+    libxt
     libpcap
     qt6.qtbase
     libusb1
diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 0f0f637c8f12..62199f8631e3 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -32,7 +32,7 @@
   gsettings-desktop-schemas,
   gtk3,
   libdbusmenu-gtk2,
-  libXdamage,
+  libxdamage,
   nss,
   udev,
 }:
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
     fuse
     gtk3
     libdbusmenu-gtk2
-    libXdamage
+    libxdamage
     nss
     udev
   ];
diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index 34fdbfe53b48..5c55366879e7 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -6,7 +6,7 @@
   glib,
   intltool,
   libfm,
-  libX11,
+  libx11,
   pango,
   pkg-config,
   wrapGAppsHook3,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk
     libfm'
-    libX11
+    libx11
     pango
     adwaita-icon-theme
   ];
diff --git a/pkgs/by-name/pc/pcmanx-gtk2/package.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
index 5829245c19ff..72ce2a596bdc 100644
--- a/pkgs/by-name/pc/pcmanx-gtk2/package.nix
+++ b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   gtk2,
-  libXft,
+  libxft,
   intltool,
   automake,
   autoconf,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk2
-    libXft
+    libxft
     libtool
   ];
 
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 48c583437036..da40c9eb4b8a 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -8,7 +8,7 @@
   extra-cmake-modules,
   ffmpeg,
   gtk3,
-  libXrandr,
+  libxrandr,
   libaio,
   libbacktrace,
   libpcap,
@@ -91,7 +91,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     libbacktrace
     libpcap
     libwebp
-    libXrandr
+    libxrandr
     lz4
     qtbase
     qtsvg
diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix
index b8dbf284a0b5..0f3f0dea03d7 100644
--- a/pkgs/by-name/pe/pekwm/package.nix
+++ b/pkgs/by-name/pe/pekwm/package.nix
@@ -5,11 +5,11 @@
   gawk,
   cmake,
   gnugrep,
-  libXext,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
+  libxext,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
   libjpeg,
   libpng,
   pkg-config,
@@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXext
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
+    libxext
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
     libjpeg
     libpng
   ];
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index c3579e63b692..61efbb593b3c 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -10,10 +10,10 @@
   libev,
   libGL,
   libepoxy,
-  libX11,
+  libx11,
   libxcb,
   libxdg_basedir,
-  libXext,
+  libxext,
   libxml2,
   libxslt,
   makeWrapper,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     libev
     libGL
     libepoxy
-    libX11
+    libx11
     libxcb
     libxdg_basedir
-    libXext
+    libxext
     libxml2
     libxslt
     pcre2
diff --git a/pkgs/by-name/pi/piglit/package.nix b/pkgs/by-name/pi/piglit/package.nix
index 527bced7afb8..a761cf3c950a 100644
--- a/pkgs/by-name/pi/piglit/package.nix
+++ b/pkgs/by-name/pi/piglit/package.nix
@@ -19,9 +19,9 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXau,
-  libX11,
-  libXrender,
+  libxau,
+  libx11,
+  libxrender,
   libxcb,
   libxkbcommon,
   mesa,
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libglvnd
-    libXau
-    libX11
-    libXrender
+    libxau
+    libx11
+    libxrender
     libxcb
     libxkbcommon
     (python3.withPackages (
diff --git a/pkgs/by-name/pi/pinentry-dmenu/package.nix b/pkgs/by-name/pi/pinentry-dmenu/package.nix
index 1e7237d52d6f..8d5648edbb18 100644
--- a/pkgs/by-name/pi/pinentry-dmenu/package.nix
+++ b/pkgs/by-name/pi/pinentry-dmenu/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   gpgme,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   pkg-config,
   zlib,
   writeText,
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
     libassuan
     libconfig
     libgpg-error
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 9493de285ec8..be4a82878171 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -13,7 +13,7 @@
   libpng,
   libsigcxx,
   libvorbis,
-  libX11,
+  libx11,
   lua5_2,
   libgbm,
   SDL2,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libsigcxx
     libvorbis
-    libX11
+    libx11
     lua5_2
     libgbm
     SDL2
diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index a34dfd0ff0bd..0d528588167f 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -20,7 +20,7 @@
   gsettings-desktop-schemas,
   librsvg,
   libwebp,
-  libX11,
+  libx11,
   lcms2,
   bison,
   flex,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
     libtiff
     libwebp
-    libX11
+    libx11
     xapp
   ];
 
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index 1a48c79d4fc2..7221d9d3564d 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -13,13 +13,13 @@
   vulkan-loader,
   openssl,
   libGL,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
 
   makeDesktopItem,
   copyDesktopItems,
@@ -102,13 +102,13 @@ buildDotnetModule (finalAttrs: {
     vulkan-loader
     openssl
     libGL
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
   ];
 
   desktopItems = [
diff --git a/pkgs/by-name/pl/plank/package.nix b/pkgs/by-name/pl/plank/package.nix
index 27df4260ac74..f5f528ce2955 100644
--- a/pkgs/by-name/pl/plank/package.nix
+++ b/pkgs/by-name/pl/plank/package.nix
@@ -10,9 +10,9 @@
   gnome-common,
   gtk3,
   libwnck,
-  libX11,
-  libXfixes,
-  libXi,
+  libx11,
+  libxfixes,
+  libxi,
   pango,
   gettext,
   pkg-config,
@@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
     gnome-menus
     dconf
     gtk3
-    libX11
-    libXfixes
-    libXi
+    libx11
+    libxfixes
+    libxi
     libdbusmenu-gtk3
     libgee
     libwnck
diff --git a/pkgs/by-name/pl/plib/package.nix b/pkgs/by-name/pl/plib/package.nix
index 4cd1730d0362..96dd966d2f13 100644
--- a/pkgs/by-name/pl/plib/package.nix
+++ b/pkgs/by-name/pl/plib/package.nix
@@ -7,11 +7,11 @@
   libGL,
   libglut,
   SDL,
-  libXi,
+  libxi,
   libsm,
-  libXmu,
-  libXext,
-  libX11,
+  libxmu,
+  libxext,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -52,11 +52,11 @@ stdenv.mkDerivation rec {
     SDL
 
     # The following libs ought to be propagated build inputs of Mesa.
-    libXi
+    libxi
     libsm
-    libXmu
-    libXext
-    libX11
+    libxmu
+    libxext
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/pl/ploticus/package.nix b/pkgs/by-name/pl/ploticus/package.nix
index ecb3e6861fa2..c197e67729dd 100644
--- a/pkgs/by-name/pl/ploticus/package.nix
+++ b/pkgs/by-name/pl/ploticus/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   zlib,
-  libX11,
+  libx11,
   libpng,
   libjpeg,
   gd,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
-    libX11
+    libx11
     libpng
     gd
     freetype
diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix
index 19ee4b47b317..b9edce149bcc 100644
--- a/pkgs/by-name/pl/plplot/package.nix
+++ b/pkgs/by-name/pl/plplot/package.nix
@@ -36,11 +36,13 @@ stdenv.mkDerivation rec {
     ];
 
   passthru = {
-    libX11 = libx11;
     inherit
       enableWX
       enableXWin
+      libx11
       ;
+    # backwards compat
+    libX11 = libx11;
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix
index d64452d3c066..dad6332508d3 100644
--- a/pkgs/by-name/pl/plugdata/package.nix
+++ b/pkgs/by-name/pl/plugdata/package.nix
@@ -9,14 +9,14 @@
   cmake,
   pkg-config,
   alsa-lib,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrender,
-  libXrandr,
-  libXdmcp,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrender,
+  libxrandr,
+  libxdmcp,
+  libxtst,
   xvfb,
   freetype,
   fontconfig,
@@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libxkbcommon
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrender
-    libXrandr
-    libXdmcp
-    libXtst
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrender
+    libxrandr
+    libxdmcp
+    libxtst
     xvfb
     libjack2
     expat
diff --git a/pkgs/by-name/pl/pluginval/package.nix b/pkgs/by-name/pl/pluginval/package.nix
index cf982a0ceabf..368b21b753d5 100644
--- a/pkgs/by-name/pl/pluginval/package.nix
+++ b/pkgs/by-name/pl/pluginval/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   ladspaH,
 }:
 
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     freetype
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     ladspaH
   ];
 
diff --git a/pkgs/by-name/pm/pmars/package.nix b/pkgs/by-name/pm/pmars/package.nix
index 2bb2830f97eb..0a90a61c5ef3 100644
--- a/pkgs/by-name/pm/pmars/package.nix
+++ b/pkgs/by-name/pm/pmars/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchzip,
   installShellFiles,
-  libX11,
+  libx11,
   ncurses,
   pkg-config,
   enableXwinGraphics ? false,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ installShellFiles ] ++ lib.optionals (pkgConfigLibs != [ ]) [ pkg-config ];
 
   buildInputs =
-    lib.optionals enableXwinGraphics [ libX11 ] ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
+    lib.optionals enableXwinGraphics [ libx11 ] ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
 
   preConfigure = ''
     cd src
diff --git a/pkgs/by-name/pm/pmenu/package.nix b/pkgs/by-name/pm/pmenu/package.nix
index 71319a7a532a..ae99c1069430 100644
--- a/pkgs/by-name/pm/pmenu/package.nix
+++ b/pkgs/by-name/pm/pmenu/package.nix
@@ -5,11 +5,11 @@
   writeText,
   fontconfig,
   imlib2,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrender,
   conf ? null,
 }:
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     imlib2
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrender
   ];
 
   postPatch =
diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix
index e5ea31043a16..a8046dc4f78e 100644
--- a/pkgs/by-name/pn/pnmixer/package.nix
+++ b/pkgs/by-name/pn/pnmixer/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   glib,
   libnotify,
-  libX11,
+  libx11,
   pcre,
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     glib
     libnotify
-    libX11
+    libx11
     pcre
   ];
 
diff --git a/pkgs/by-name/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
index ac8498bf66e7..027e03d335e7 100644
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@@ -14,18 +14,18 @@
   glib,
   at-spi2-atk,
   dbus,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libxtst,
+  libxscrnsaver,
   nss,
   nspr,
   alsa-lib,
@@ -64,18 +64,18 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     at-spi2-atk
     dbus
-    libX11
+    libx11
     libxcb
-    libXi
-    libXcursor
-    libXdamage
-    libXrandr
-    libXcomposite
-    libXext
-    libXfixes
-    libXrender
-    libXtst
-    libXScrnSaver
+    libxi
+    libxcursor
+    libxdamage
+    libxrandr
+    libxcomposite
+    libxext
+    libxfixes
+    libxrender
+    libxtst
+    libxscrnsaver
     nss
     nspr
     alsa-lib
diff --git a/pkgs/by-name/po/polar-bookshelf1/package.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
index 3cb13af1e229..b1e62094171f 100644
--- a/pkgs/by-name/po/polar-bookshelf1/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf1/package.nix
@@ -18,17 +18,17 @@
   glibc,
   gsettings-desktop-schemas,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libnghttp2,
   libudev0-shim,
   libxcb,
@@ -62,17 +62,17 @@ stdenv.mkDerivation rec {
     glib
     gsettings-desktop-schemas
     gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libxcb
     nspr
     nss
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 6adee06b5ff5..d1375d9d8e20 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   fetchpatch,
   libuv,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libxcb,
   pcre,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libuv
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     libxcb
     pcre
diff --git a/pkgs/by-name/po/polyglot/package.nix b/pkgs/by-name/po/polyglot/package.nix
index b16d15ee409a..9b4c5afa479f 100644
--- a/pkgs/by-name/po/polyglot/package.nix
+++ b/pkgs/by-name/po/polyglot/package.nix
@@ -7,7 +7,7 @@
   maven,
   libGL,
   xdg-utils,
-  libXxf86vm,
+  libxxf86vm,
   zip,
   zlib,
 }:
@@ -60,7 +60,7 @@ maven.buildMavenPackage rec {
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           libGL
-          libXxf86vm
+          libxxf86vm
         ]
       }"
 
diff --git a/pkgs/by-name/po/pong3d/package.nix b/pkgs/by-name/po/pong3d/package.nix
index 944ba4f0e253..d9aebcadbd02 100644
--- a/pkgs/by-name/po/pong3d/package.nix
+++ b/pkgs/by-name/po/pong3d/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
 
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
        #include <string.h>"
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix
index 4fbf258da2a5..c542b9f09a8a 100644
--- a/pkgs/by-name/po/poptracker/package.nix
+++ b/pkgs/by-name/po/poptracker/package.nix
@@ -6,7 +6,7 @@
   SDL2,
   SDL2_ttf,
   SDL2_image,
-  libX11,
+  libx11,
   openssl,
   zlib,
   which,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_ttf
     SDL2_image
-    libX11
+    libx11
     openssl
     zlib
   ];
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 3959d20e8fad..812b6fa2f9f9 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -6,11 +6,11 @@
   installShellFiles,
   jre,
 
-  libX11,
-  libXext,
-  libXcursor,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxcursor,
+  libxrandr,
+  libxxf86vm,
   libpulseaudio,
   libGL,
   glfw,
@@ -31,11 +31,11 @@ let
     (lib.getLib stdenv.cc.cc)
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXcursor
-    libXrandr
-    libXxf86vm
+    libx11
+    libxext
+    libxcursor
+    libxrandr
+    libxxf86vm
 
     # lwjgl
     libpulseaudio
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
index 441f1a224a49..4e1fae54e7f6 100644
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -17,17 +17,17 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
   libdrm,
   libgbm,
   libGL,
@@ -125,18 +125,18 @@ stdenv.mkDerivation {
           libGL
           libsecret
           libuuid
-          libX11
-          libXcomposite
-          libXcursor
-          libXdamage
-          libXext
-          libXfixes
-          libXi
-          libXrandr
-          libXrender
-          libXScrnSaver
+          libx11
+          libxcomposite
+          libxcursor
+          libxdamage
+          libxext
+          libxfixes
+          libxi
+          libxrandr
+          libxrender
+          libxscrnsaver
           libxkbcommon
-          libXtst
+          libxtst
           nspr
           nss
           pango
diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index dd99c2ef343f..a1b284a9a339 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -6,7 +6,7 @@
   automake,
   boost,
   zlib,
-  libX11,
+  libx11,
   libice,
   libsm,
   libpng,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    libX11
+    libx11
     libice
     libsm
     libpng
diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index deb57e13697c..1bc3b1a69348 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -9,7 +9,7 @@
   libffi,
   libsForQt5,
   libzip,
-  libX11,
+  libx11,
   makeDesktopItem,
   makeWrapper,
   pkg-config,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     glew
     libzip
     zlib
diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix
index 32d24b9cb0cb..5f4bff2fcb04 100644
--- a/pkgs/by-name/pr/premid/package.nix
+++ b/pkgs/by-name/pr/premid/package.nix
@@ -24,17 +24,17 @@
   libnotify,
   libpulseaudio,
   libuuid,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   libgbm,
@@ -66,10 +66,10 @@ stdenv.mkDerivation rec {
     cups
     libdrm
     libuuid
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -101,23 +101,23 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     libnotify
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
     libuuid
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     nspr
     nss
     libxcb
     pango
     systemd
-    libXScrnSaver
+    libxscrnsaver
     libappindicator-gtk3
     libdbusmenu
   ];
diff --git a/pkgs/by-name/pr/primusLib/package.nix b/pkgs/by-name/pr/primusLib/package.nix
index 77f37052f1bb..9294249a419b 100644
--- a/pkgs/by-name/pr/primusLib/package.nix
+++ b/pkgs/by-name/pr/primusLib/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
+  libx11,
   libGL,
   linuxPackages,
   nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; },
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libGL
   ];
 
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index b1a27bcfbb9f..d443d52220e1 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -10,11 +10,11 @@
   kdePackages,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
   libjack2,
   libpulseaudio,
   libusb1,
@@ -89,11 +89,11 @@ symlinkJoin {
 
         ## glfw
         libGL
-        libX11
-        libXcursor
-        libXext
-        libXrandr
-        libXxf86vm
+        libx11
+        libxcursor
+        libxext
+        libxrandr
+        libxxf86vm
 
         udev # oshi
 
diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
index af73b1487eaf..54cfc3a09066 100644
--- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
+++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libprojectm,
   libGL,
-  libX11,
+  libx11,
   poco,
   utf8proc,
   SDL2,
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     poco
     utf8proc
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/pr/proteus/package.nix b/pkgs/by-name/pr/proteus/package.nix
index 191ddd8d7773..2e772294e5c9 100644
--- a/pkgs/by-name/pr/proteus/package.nix
+++ b/pkgs/by-name/pr/proteus/package.nix
@@ -8,12 +8,12 @@
   alsa-lib,
   freetype,
   libjack2,
-  libX11,
-  libXext,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libjack2
-    libX11
-    libXext
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/pu/punes/package.nix b/pkgs/by-name/pu/punes/package.nix
index 8d3f22283aad..decc5d20c9d8 100644
--- a/pkgs/by-name/pu/punes/package.nix
+++ b/pkgs/by-name/pu/punes/package.nix
@@ -9,8 +9,8 @@
   ffmpeg,
   libGLU,
   alsa-lib,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   sndio,
   libsForQt5,
   qt6Packages,
@@ -83,8 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
   ])
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isBSD [
     sndio
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index 9c5dc2e8d9fb..5187b3bfc81b 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -8,10 +8,10 @@
   gettext,
   perl,
   wxGTK32,
-  libXext,
-  libXi,
-  libXt,
-  libXtst,
+  libxext,
+  libxi,
+  libxt,
+  libxtst,
   xercesc,
   qrencode,
   libuuid,
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     file
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXext
-    libXi
-    libXt
-    libXtst
+    libxext
+    libxi
+    libxt
+    libxtst
     libuuid
     libyubikey
     yubikey-personalization
diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix
index d0240b9d0087..834d2ab4416a 100644
--- a/pkgs/by-name/qd/qdelay/package.nix
+++ b/pkgs/by-name/qd/qdelay/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/qe/qemacs/package.nix b/pkgs/by-name/qe/qemacs/package.nix
index 62f841ea1b03..a9fe44745baa 100644
--- a/pkgs/by-name/qe/qemacs/package.nix
+++ b/pkgs/by-name/qe/qemacs/package.nix
@@ -6,9 +6,9 @@
   which,
   texi2html,
   enableX11 ? true,
-  libX11,
-  libXext,
-  libXv,
+  libx11,
+  libxext,
+  libxv,
   libpng,
 }:
 
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
   ];
   buildInputs = lib.optionals enableX11 [
     libpng
-    libX11
-    libXext
-    libXv
+    libx11
+    libxext
+    libxv
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 383cd0c4a0ff..1799ab01f934 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -7,8 +7,8 @@
   ffmpeg,
   fribidi,
   game-music-emu,
-  libXdmcp,
-  libXv,
+  libxdmcp,
+  libxv,
   libass,
   libcddb,
   libcdio,
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     fribidi
     game-music-emu
-    libXdmcp
-    libXv
+    libxdmcp
+    libxv
     libass
     libcddb
     libcdio
diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix
index a63ce14c9b86..b18baac11b9d 100644
--- a/pkgs/by-name/qt/qtox/package.nix
+++ b/pkgs/by-name/qt/qtox/package.nix
@@ -8,8 +8,8 @@
   kdePackages,
   libtoxcore,
   libpthread-stubs,
-  libXdmcp,
-  libXScrnSaver,
+  libxdmcp,
+  libxscrnsaver,
   ffmpeg,
   filter-audio,
   libexif,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.sonnet
     libtoxcore
     libpthread-stubs
-    libXdmcp
-    libXScrnSaver
+    libxdmcp
+    libxscrnsaver
     ffmpeg
     filter-audio
     libexif
diff --git a/pkgs/by-name/qu/quake3e/package.nix b/pkgs/by-name/qu/quake3e/package.nix
index 60d99d7b5643..25f05d36891a 100644
--- a/pkgs/by-name/qu/quake3e/package.nix
+++ b/pkgs/by-name/qu/quake3e/package.nix
@@ -5,12 +5,12 @@
   makeWrapper,
   curl,
   libGL,
-  libX11,
-  libXxf86dga,
+  libx11,
+  libxxf86dga,
   alsa-lib,
-  libXrandr,
-  libXxf86vm,
-  libXext,
+  libxrandr,
+  libxxf86vm,
+  libxext,
   SDL2,
   glibc,
   copyDesktopItems,
@@ -37,12 +37,12 @@ stdenv.mkDerivation {
   buildInputs = [
     curl
     libGL
-    libX11
-    libXxf86dga
+    libx11
+    libxxf86dga
     alsa-lib
-    libXrandr
-    libXxf86vm
-    libXext
+    libxrandr
+    libxxf86vm
+    libxext
     SDL2
     glibc
   ];
@@ -53,10 +53,10 @@ stdenv.mkDerivation {
     sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c
     sed -i -e 's#Sys_LoadLibrary( "libpthread.so.0" )#Sys_LoadLibrary( "${glibc}/lib/libpthread.so.0" )#' code/unix/linux_snd.c
     sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
-    sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libxxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
+    sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libxrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libxxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libxxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c
     sed -i -e 's#"libcurl.so.4"#"${curl.out}/lib/libcurl.so.4"#' code/client/cl_curl.h
   '';
 
diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix
index 1e43f5fce8c6..85bfe90885e4 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/package.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix
@@ -78,14 +78,14 @@ buildFHSEnv rec {
       # This seems ugly - can we override `libpng = libpng12` for all `pkgs`?
       freetype = pkgs.freetype.override { libpng = libpng12; };
       fontconfig = pkgs.fontconfig.override { inherit freetype; };
-      libXft = pkgs.libxft.override { inherit freetype fontconfig; };
+      libxft = pkgs.libxft.override { inherit freetype fontconfig; };
     in
     [
       # questa requirements
       libxml2
       ncurses5
       unixODBC
-      libXft
+      libxft
       # common requirements
       freetype
       fontconfig
diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix
index 324533c5cc29..ef06bf4f0af4 100644
--- a/pkgs/by-name/qu/quartz-wm/package.nix
+++ b/pkgs/by-name/qu/quartz-wm/package.nix
@@ -6,11 +6,11 @@
   pixman,
   pkg-config,
   util-macros,
-  libXinerama,
+  libxinerama,
   libapplewm,
   xorgproto,
-  libXrandr,
-  libXext,
+  libxrandr,
+  libxext,
 }:
 
 clangStdenv.mkDerivation (finalAttrs: {
@@ -30,11 +30,11 @@ clangStdenv.mkDerivation (finalAttrs: {
     util-macros
   ];
   buildInputs = [
-    libXinerama
+    libxinerama
     libapplewm
     xorgproto
-    libXrandr
-    libXext
+    libxrandr
+    libxext
     pixman
   ];
 
diff --git a/pkgs/by-name/qu/qucs-s/package.nix b/pkgs/by-name/qu/qucs-s/package.nix
index 7196354b1176..2bcc4611adf1 100644
--- a/pkgs/by-name/qu/qucs-s/package.nix
+++ b/pkgs/by-name/qu/qucs-s/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   flex,
   bison,
-  libX11,
+  libx11,
   cmake,
   gperf,
   adms,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       qtwayland
-      libX11
+      libx11
     ]
     ++ kernels;
 
diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix
index 6bde1ed4e46e..6d093a62ed6f 100644
--- a/pkgs/by-name/qu/quesoglc/package.nix
+++ b/pkgs/by-name/qu/quesoglc/package.nix
@@ -8,7 +8,7 @@
   freetype,
   fontconfig,
   fribidi,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "quesoglc";
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fontconfig
     fribidi
-    libX11
+    libx11
   ];
 
   # required for cross builds
diff --git a/pkgs/by-name/ra/radiance-vj/package.nix b/pkgs/by-name/ra/radiance-vj/package.nix
index 7325c2b65dbc..8d6e7363cdbc 100644
--- a/pkgs/by-name/ra/radiance-vj/package.nix
+++ b/pkgs/by-name/ra/radiance-vj/package.nix
@@ -9,14 +9,14 @@
   stdenv,
   alsa-lib,
   wayland,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXinerama,
-  libXpresent,
-  libXfixes,
-  libXext,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxinerama,
+  libxpresent,
+  libxfixes,
+  libxext,
   libxcb,
   yt-dlp,
 }:
@@ -44,14 +44,14 @@ rustPlatform.buildRustPackage rec {
     libxkbcommon
     alsa-lib
     wayland
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXinerama
-    libXpresent
-    libXfixes
-    libXext
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxinerama
+    libxpresent
+    libxfixes
+    libxext
     libxcb
   ];
 
@@ -64,14 +64,14 @@ rustPlatform.buildRustPackage rec {
       --add-rpath "${
         lib.makeLibraryPath [
           libxkbcommon
-          libX11
-          libXcursor
-          libXi
-          libXrandr
-          libXinerama
-          libXpresent
-          libXfixes
-          libXext
+          libx11
+          libxcursor
+          libxi
+          libxrandr
+          libxinerama
+          libxpresent
+          libxfixes
+          libxext
         ]
       }:$out/lib" \
       $out/bin/radiance \
diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix
index 3a77bb6193e6..dee88d1aa92d 100644
--- a/pkgs/by-name/ra/ragnarwm/package.nix
+++ b/pkgs/by-name/ra/ragnarwm/package.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXcursor,
-  libXcomposite,
+  libx11,
+  libxft,
+  libxcursor,
+  libxcomposite,
   conf ? null,
   nixosTests,
 }:
@@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXcursor
-    libXcomposite
+    libx11
+    libxft
+    libxcursor
+    libxcomposite
   ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
diff --git a/pkgs/by-name/ra/ratmen/package.nix b/pkgs/by-name/ra/ratmen/package.nix
index 22be3abf673b..04473a707379 100644
--- a/pkgs/by-name/ra/ratmen/package.nix
+++ b/pkgs/by-name/ra/ratmen/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   perl,
   xorgproto,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     perl
     xorgproto
-    libX11
+    libx11
   ];
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix
index a410a79039ba..58916d67cf6f 100644
--- a/pkgs/by-name/ra/ratpoison/package.nix
+++ b/pkgs/by-name/ra/ratpoison/package.nix
@@ -5,13 +5,13 @@
   autoreconfHook,
   fontconfig,
   freetype,
-  libX11,
-  libXft,
-  libXi,
-  libXpm,
-  libXrandr,
-  libXt,
-  libXtst,
+  libx11,
+  libxft,
+  libxi,
+  libxpm,
+  libxrandr,
+  libxt,
+  libxtst,
   perl,
   pkg-config,
   readline,
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libX11
-    libXft
-    libXi
-    libXpm
-    libXrandr
-    libXt
-    libXtst
+    libx11
+    libxft
+    libxi
+    libxpm
+    libxrandr
+    libxt
+    libxtst
     perl
     readline
     xorgproto
@@ -90,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "ratpoison";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 93f993759b22..5fee6c4498df 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -10,7 +10,7 @@
   libpulseaudio,
   raylib-games,
   libGLU,
-  libX11,
+  libx11,
   platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work
   pulseSupport ? stdenv.hostPlatform.isLinux,
   alsaSupport ? false,
@@ -55,7 +55,7 @@ lib.checkListOfEnum "raylib: platform"
 
       propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
         libGLU
-        libX11
+        libx11
       ];
 
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
diff --git a/pkgs/by-name/rd/rdesktop/package.nix b/pkgs/by-name/rd/rdesktop/package.nix
index 4580913d5568..c50c8da55514 100644
--- a/pkgs/by-name/rd/rdesktop/package.nix
+++ b/pkgs/by-name/rd/rdesktop/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   openssl,
-  libX11,
+  libx11,
   krb5,
-  libXcursor,
+  libxcursor,
   libtasn1,
   nettle,
   gnutls,
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     openssl
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libtasn1
     nettle
     gnutls
diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
index 87152c4da86c..416b4aa55ee4 100644
--- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
+++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
@@ -3,8 +3,8 @@
   fetchurl,
   autoPatchelfHook,
   rpmextract,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   pname,
   version,
   meta,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     rpmextract
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     stdenv.cc.cc.libgcc or null
   ];
 
diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix
index d8fc4d1c33ae..df457eeb3d4c 100644
--- a/pkgs/by-name/re/redeclipse/package.nix
+++ b/pkgs/by-name/re/redeclipse/package.nix
@@ -8,7 +8,7 @@
   freetype,
   zlib,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   SDL2_image,
   SDL2_mixer,
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
     freetype
     zlib
     SDL2
diff --git a/pkgs/by-name/re/redux/package.nix b/pkgs/by-name/re/redux/package.nix
index b5d2a9c19265..71e3abdcaf30 100644
--- a/pkgs/by-name/re/redux/package.nix
+++ b/pkgs/by-name/re/redux/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   writeScript,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   alsa-lib,
   autoPatchelfHook,
   releasePath ? null,
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     alsa-lib
     (lib.getLib stdenv.cc.cc)
   ];
diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix
index 33576e1ccabf..bf1a80125869 100644
--- a/pkgs/by-name/re/reevr/package.nix
+++ b/pkgs/by-name/re/reevr/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 0c6e0e9dab7d..e11909347633 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -13,7 +13,7 @@
   gtk3,
   gettext,
   libxkbfile,
-  libX11,
+  libx11,
   python3,
   freerdp,
   libssh,
@@ -24,7 +24,7 @@
   libappindicator-gtk3,
   libvncserver,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libsecret,
   libsoup_3,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gettext
     libxkbfile
-    libX11
+    libx11
     freerdp
     libssh
     libgcrypt
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     libvncserver
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libsoup_3
     spice-protocol
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --set-default SSL_CERT_DIR "/etc/ssl/certs/"
-      --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
+      --prefix LD_LIBRARY_PATH : "${libx11.out}/lib"
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
       ''}
diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix
index 5bc82b6f3844..62dcdff97d22 100644
--- a/pkgs/by-name/re/remote-touchpad/package.nix
+++ b/pkgs/by-name/re/remote-touchpad/package.nix
@@ -2,10 +2,10 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libXi,
-  libXrandr,
-  libXt,
-  libXtst,
+  libxi,
+  libxrandr,
+  libxt,
+  libxtst,
 }:
 
 buildGoModule rec {
@@ -20,10 +20,10 @@ buildGoModule rec {
   };
 
   buildInputs = [
-    libXi
-    libXrandr
-    libXt
-    libXtst
+    libxi
+    libxrandr
+    libxt
+    libxtst
   ];
   tags = [ "portal,x11" ];
 
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 5eb038d83252..aba66916b67b 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -7,7 +7,7 @@
   cmake,
   fetchFromGitHub,
   fetchpatch,
-  libXdmcp,
+  libxdmcp,
   libglvnd,
   libpthread-stubs,
   makeWrapper,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     python312Packages.pyside2
     python312Packages.pyside2-tools
diff --git a/pkgs/by-name/re/renoise/package.nix b/pkgs/by-name/re/renoise/package.nix
index 4a956006eb2b..7121f1e8d676 100644
--- a/pkgs/by-name/re/renoise/package.nix
+++ b/pkgs/by-name/re/renoise/package.nix
@@ -5,12 +5,12 @@
   alsa-lib,
   fetchurl,
   libjack2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   mpg123,
   pipewire,
   releasePath ? null,
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     libjack2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     pipewire
   ];
 
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index d7ec227c467e..6e957a924503 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -15,12 +15,12 @@
   libGLU,
   libpulseaudio,
   libv4l,
-  libX11,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxdmcp,
+  libxext,
   libxkbcommon,
   libxml2,
-  libXxf86vm,
+  libxxf86vm,
   makeBinaryWrapper,
   mbedtls,
   libgbm,
@@ -99,10 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     dbus
-    libX11
-    libXdmcp
-    libXext
-    libXxf86vm
+    libx11
+    libxdmcp
+    libxext
+    libxxf86vm
     libdrm
     libpulseaudio
     libv4l
diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix
index 7bf08c4574e3..090affbf8425 100644
--- a/pkgs/by-name/ri/rigel-engine/package.nix
+++ b/pkgs/by-name/ri/rigel-engine/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   SDL2,
   SDL2_mixer,
   buildOpenGLES ? false,
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL2
     SDL2_mixer
   ];
diff --git a/pkgs/by-name/ri/rigsofrods-bin/package.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
index bae73c216e5f..d723d97c8903 100644
--- a/pkgs/by-name/ri/rigsofrods-bin/package.nix
+++ b/pkgs/by-name/ri/rigsofrods-bin/package.nix
@@ -8,8 +8,8 @@
   libGL,
   libice,
   libsm,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   zlib,
   alsa-lib,
 }:
@@ -35,8 +35,8 @@ stdenv.mkDerivation {
     libGL
     libice
     libsm
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     stdenv.cc.cc
     zlib
   ];
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index ffa6d33146ce..d0c44fffec29 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -18,10 +18,10 @@
   vulkan-loader,
   libxkbcommon,
   withX11 ? !stdenv.hostPlatform.isDarwin,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
   libxcb,
   withWayland ? !stdenv.hostPlatform.isDarwin,
   wayland,
@@ -38,10 +38,10 @@ let
       vulkan-loader
     ]
     ++ lib.optionals withX11 [
-      libX11
-      libXcursor
-      libXi
-      libXrandr
+      libx11
+      libxcursor
+      libxi
+      libxrandr
       libxcb
     ]
     ++ lib.optionals withWayland [
diff --git a/pkgs/by-name/ri/ripplerx/package.nix b/pkgs/by-name/ri/ripplerx/package.nix
index edbc55fd9a41..78dac04e448b 100644
--- a/pkgs/by-name/ri/ripplerx/package.nix
+++ b/pkgs/by-name/ri/ripplerx/package.nix
@@ -9,11 +9,11 @@
   expat,
   fontconfig,
   freetype,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   nix-update-script,
   makeDesktopItem,
   copyDesktopItems,
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     fontconfig
     freetype
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   env = {
diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index 989d07331e18..7385f480bd47 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -4,7 +4,7 @@
   callPackage,
   fetchFromCodeberg,
   libGL,
-  libX11,
+  libx11,
   libevdev,
   libinput,
   libxkbcommon,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     wlroots_0_19
   ]
-  ++ lib.optional xwaylandSupport libX11;
+  ++ lib.optional xwaylandSupport libx11;
 
   dontConfigure = true;
 
diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index 8035b400dbfd..42f9a7a37f3a 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -6,8 +6,8 @@
   lv2,
   fftw,
   cmake,
-  libXpm,
-  libXft,
+  libxpm,
+  libxft,
   libjack2,
   libsamplerate,
   libsndfile,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXft
-    libXpm
+    libxft
+    libxpm
     lv2
     fftw
     libjack2
diff --git a/pkgs/by-name/ro/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix
index 48a2f9aee6cc..775f412f3206 100644
--- a/pkgs/by-name/ro/roam-research/linux.nix
+++ b/pkgs/by-name/ro/roam-research/linux.nix
@@ -12,17 +12,17 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libpulseaudio,
   libxcb,
@@ -48,13 +48,13 @@ let
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
+    libx11
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
     libdrm
     libxcb
     libxkbcommon
@@ -64,10 +64,10 @@ let
     nss
     pango
     stdenv.cc.cc
-    libXScrnSaver
-    libXcursor
-    libXrender
-    libXtst
+    libxscrnsaver
+    libxcursor
+    libxrender
+    libxtst
     libpulseaudio
     udev
   ];
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 0c0a7f281104..da20b9958e2f 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -9,8 +9,8 @@
   gtk3,
   harfbuzz,
   lib,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libepoxy,
   libpthread-stubs,
   libselinux,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     harfbuzz
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libepoxy
     libpthread-stubs
     libselinux
diff --git a/pkgs/by-name/rs/rss-glx/package.nix b/pkgs/by-name/rs/rss-glx/package.nix
index d59b6f3b2c61..251ee7607aa1 100644
--- a/pkgs/by-name/rs/rss-glx/package.nix
+++ b/pkgs/by-name/rs/rss-glx/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   autoconf,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libGLU,
   libGL,
   imagemagick6,
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
     imagemagick6
     libtiff
     bzip2
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 2f0952354a48..a60b9ad05261 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -8,10 +8,10 @@
   autoPatchelfHook,
   alsa-lib,
   wayland,
-  libXcursor,
-  libXrandr,
-  libXi,
-  libX11,
+  libxcursor,
+  libxrandr,
+  libxi,
+  libx11,
   libxcb,
   vulkan-loader,
   udev,
@@ -87,10 +87,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       openh264
     ]
     ++ lib.optionals withX11 [
-      libXcursor
-      libXrandr
-      libXi
-      libX11
+      libxcursor
+      libxrandr
+      libxi
+      libx11
       libxcb
     ]
   );
diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index 8b357475ebf1..a566c6e6e964 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -13,7 +13,7 @@
   libGL,
   libpulseaudio,
   libsm,
-  libXxf86vm,
+  libxxf86vm,
   libx11,
   openssl_1_1,
   pango,
@@ -49,7 +49,7 @@ let
       glibc
       gtk2-x11
       libsm
-      libXxf86vm
+      libxxf86vm
       libx11
       openssl_1_1
       pango
@@ -124,7 +124,7 @@ buildFHSEnv {
     libGL
     libpulseaudio
     libsm
-    libXxf86vm
+    libxxf86vm
     libx11
     openssl_1_1
     pango
diff --git a/pkgs/by-name/ru/runningx/package.nix b/pkgs/by-name/ru/runningx/package.nix
index 38fbc0c551cd..75e4faf331f6 100644
--- a/pkgs/by-name/ru/runningx/package.nix
+++ b/pkgs/by-name/ru/runningx/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   dontUnpack = true;
 
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 8a4c00874b38..05989c11182b 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -8,7 +8,7 @@
   ffmpeg_7,
   gst_all_1,
   fuse3,
-  libXtst,
+  libxtst,
   libaom,
   libopus,
   libpulseaudio,
@@ -127,7 +127,7 @@ flutter329.buildFlutterApplication rec {
     fuse3
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
-    libXtst
+    libxtst
     libaom
     libopus
     libpulseaudio
diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix
index e523a6cfa9ed..040606c31e4d 100644
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -16,7 +16,7 @@
   libgit2,
   libpulseaudio,
   libsodium,
-  libXtst,
+  libxtst,
   libvpx,
   libyuv,
   libopus,
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libgit2
     libpulseaudio
     libsodium
-    libXtst
+    libxtst
     libvpx
     libyuv
     libopus
diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix
index 4ab1cdbb7cf8..bcc11a05f076 100644
--- a/pkgs/by-name/rv/rvvm/package.nix
+++ b/pkgs/by-name/rv/rvvm/package.nix
@@ -5,8 +5,8 @@
 
   SDL2,
 
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 
   guiBackend ? "sdl",
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     [ ]
     ++ lib.optionals enableSDL [ SDL2 ]
     ++ lib.optionals enableX11 [
-      libX11
-      libXext
+      libx11
+      libxext
     ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/rx/rxvt/package.nix b/pkgs/by-name/rx/rxvt/package.nix
index 38f4bd66b926..409b3e4ffc45 100644
--- a/pkgs/by-name/rx/rxvt/package.nix
+++ b/pkgs/by-name/rx/rxvt/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   pkg-config,
   libtool,
-  libX11,
-  libXt,
-  libXpm,
+  libx11,
+  libxt,
+  libxpm,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libtool
-    libX11
-    libXt
-    libXpm
+    libx11
+    libxt
+    libxpm
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index 786575107ba7..53e2e425b73a 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -23,7 +23,7 @@
   gst_all_1,
   libgee,
   libsoup_3,
-  libX11,
+  libx11,
   withGtk ? true,
   gtk4,
   libmediaart,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Move this to withGtk when it's not unconditionally included
     # https://gitlab.gnome.org/GNOME/rygel/-/issues/221
     # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27
-    libX11
+    libx11
     sqlite
     systemd
     tinysparql
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index b386c9aad439..1596cf56a0aa 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -5,7 +5,7 @@
   darwin,
   dotnetCorePackages,
   fetchFromGitLab,
-  libX11,
+  libx11,
   libgdiplus,
   moltenvk,
   ffmpeg,
@@ -19,10 +19,10 @@
   libGL,
   libice,
   libsm,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   udev,
   SDL2,
   SDL2_mixer,
@@ -59,7 +59,7 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   runtimeDeps = [
-    libX11
+    libx11
     libgdiplus
     SDL2_mixer
     openal
@@ -72,10 +72,10 @@ buildDotnetModule rec {
     glew
     libice
     libsm
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
     gtk3
 
     # Headless executable
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index a10d428f773c..6187c38a149d 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -15,17 +15,17 @@
   libsm,
   libice,
   gtk2,
-  libXext,
-  libXft,
+  libxext,
+  libxft,
   fontconfig,
-  libXrender,
-  libXfixes,
-  libX11,
-  libXi,
-  libXrandr,
-  libXcursor,
+  libxrender,
+  libxfixes,
+  libx11,
+  libxi,
+  libxrandr,
+  libxcursor,
   freetype,
-  libXinerama,
+  libxinerama,
   libxcb,
   zlib,
   pciutils,
@@ -43,17 +43,17 @@ let
     libsm
     libice
     gtk2
-    libXext
-    libXft
+    libxext
+    libxft
     fontconfig
-    libXrender
-    libXfixes
-    libX11
-    libXi
-    libXrandr
-    libXcursor
+    libxrender
+    libxfixes
+    libx11
+    libxi
+    libxrandr
+    libxcursor
     freetype
-    libXinerama
+    libxinerama
     libxcb
     zlib
     stdenv.cc.cc
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index 9f75c6fc2b0e..677a28140ec8 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -9,9 +9,9 @@
   libice,
   libsm,
   libxcrypt,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxinerama,
+  libxrandr,
+  libxtst,
   librep,
   makeWrapper,
   pango,
@@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libsm
     libxcrypt
-    libXinerama
-    libXrandr
-    libXtst
+    libxinerama
+    libxrandr
+    libxtst
     librep
     pango
     rep-gtk
diff --git a/pkgs/by-name/sb/sbs/package.nix b/pkgs/by-name/sb/sbs/package.nix
index 6351ad032b61..c4ff6ba1ab6b 100644
--- a/pkgs/by-name/sb/sbs/package.nix
+++ b/pkgs/by-name/sb/sbs/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   imlib2,
-  libXinerama,
+  libxinerama,
   pkg-config,
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix
index 8f4bff2936d2..372d4bb9a709 100644
--- a/pkgs/by-name/sc/sc-controller/package.nix
+++ b/pkgs/by-name/sc/sc-controller/package.nix
@@ -9,9 +9,9 @@
   librsvg,
   bluez,
   linuxHeaders,
-  libX11,
-  libXext,
-  libXfixes,
+  libx11,
+  libxext,
+  libxfixes,
   libusb1,
   udev,
   udevCheckHook,
@@ -71,9 +71,9 @@ python3Packages.buildPythonApplication rec {
   '';
 
   env.LD_LIBRARY_PATH = lib.makeLibraryPath [
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     libusb1
     udev
     bluez
diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix
index 7d41e00cb0ac..209edd2a2af1 100644
--- a/pkgs/by-name/sc/schismtracker/package.nix
+++ b/pkgs/by-name/sc/schismtracker/package.nix
@@ -7,8 +7,8 @@
   perl,
   pkg-config,
   SDL2,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   utf8proc,
   nix-update-script,
 }:
@@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     utf8proc
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libXext
+    libxext
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/sc/scid-vs-pc/package.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix
index 3790501a5580..6aa105841bd0 100644
--- a/pkgs/by-name/sc/scid-vs-pc/package.nix
+++ b/pkgs/by-name/sc/scid-vs-pc/package.nix
@@ -3,7 +3,7 @@
   fetchurl,
   tcl,
   tk,
-  libX11,
+  libx11,
   zlib,
   makeWrapper,
   which,
@@ -31,7 +31,7 @@ tcl.mkTclDerivation rec {
   ];
   buildInputs = [
     tk
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/sc/scid/package.nix b/pkgs/by-name/sc/scid/package.nix
index ed1d0049b5d3..c093366bf294 100644
--- a/pkgs/by-name/sc/scid/package.nix
+++ b/pkgs/by-name/sc/scid/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
   tcl,
   tk,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -31,7 +31,7 @@ tcl.mkTclDerivation rec {
 
   buildInputs = [
     tk
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/sc/scope-lite/package.nix b/pkgs/by-name/sc/scope-lite/package.nix
index 130c5704ecab..de3b08056081 100644
--- a/pkgs/by-name/sc/scope-lite/package.nix
+++ b/pkgs/by-name/sc/scope-lite/package.nix
@@ -4,16 +4,15 @@
   fetchFromGitHub,
   lib,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "scope-lite";
   version = "0.2.0";
-in
-stdenv.mkDerivation {
-  name = "scope-lite-${version}";
 
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "scope-lite";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E=";
   };
 
@@ -26,4 +25,4 @@ stdenv.mkDerivation {
     homepage = "https://github.com/martinmoene/scope-lite";
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sc/scrolls/package.nix b/pkgs/by-name/sc/scrolls/package.nix
index 743da81e53d9..a30251275389 100644
--- a/pkgs/by-name/sc/scrolls/package.nix
+++ b/pkgs/by-name/sc/scrolls/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   gcc,
   libGLU,
-  libX11,
-  libXext,
-  libXcursor,
+  libx11,
+  libxext,
+  libxcursor,
   libpulseaudio,
 }:
 stdenv.mkDerivation {
@@ -31,9 +31,9 @@ stdenv.mkDerivation {
   libPath = lib.makeLibraryPath [
     gcc
     libGLU
-    libX11
-    libXext
-    libXcursor
+    libx11
+    libxext
+    libxcursor
     libpulseaudio
   ];
 
diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix
index 581caa05678a..3fc1fccb4a66 100644
--- a/pkgs/by-name/sc/scrot/package.nix
+++ b/pkgs/by-name/sc/scrot/package.nix
@@ -5,11 +5,11 @@
   imlib2,
   autoreconfHook,
   autoconf-archive,
-  libX11,
-  libXext,
-  libXfixes,
-  libXcomposite,
-  libXinerama,
+  libx11,
+  libxext,
+  libxfixes,
+  libxcomposite,
+  libxinerama,
   pkg-config,
   libbsd,
 }:
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXext
-    libXfixes
-    libXcomposite
-    libXinerama
+    libx11
+    libxext
+    libxfixes
+    libxcomposite
+    libxinerama
     libbsd
   ];
 
diff --git a/pkgs/by-name/sc/sct/package.nix b/pkgs/by-name/sc/sct/package.nix
index 610e06da919b..1006f73c571c 100644
--- a/pkgs/by-name/sc/sct/package.nix
+++ b/pkgs/by-name/sc/sct/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   xorgproto,
 }:
 
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     xorgproto
   ];
 
diff --git a/pkgs/by-name/sc/scummvm/package.nix b/pkgs/by-name/sc/scummvm/package.nix
index e1d96694b65e..ab8660f0a620 100644
--- a/pkgs/by-name/sc/scummvm/package.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -16,7 +16,7 @@
   libvorbis,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   zlib,
   cctools,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       libtheora
       libvorbis
       SDL2
-      libX11
+      libx11
       zlib
     ];
 
diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index 1ee22a2e3e9b..42b823644299 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   libGLU,
   libiconv,
-  libX11,
+  libx11,
   mesa,
   pkg-config,
   pkg-config-unwrapped,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedNativeBuildInputs = [ pkg-config-unwrapped ];
 
   buildInputs = [
-    libX11
+    libx11
     sdl2-compat
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index b1595498d106..9110ec50d236 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -3,7 +3,7 @@
   SDL,
   fetchFromGitHub,
   giflib,
-  libXpm,
+  libxpm,
   libjpeg,
   libpng,
   libtiff,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL
     giflib
-    libXpm
+    libxpm
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index c0af86c9088d..696786bd4dd9 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -6,7 +6,7 @@
   sdl3,
   stdenv,
   testers,
-  libX11,
+  libx11,
   libGL,
   nix-update-script,
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     sdl3'
   ]
-  ++ lib.optional x11Support libX11;
+  ++ lib.optional x11Support libx11;
 
   checkInputs = [ libGL ];
 
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 607380908ffd..834520a24a0a 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -17,14 +17,14 @@
   libusb1,
   libxkbcommon,
   libgbm,
-  libX11,
+  libx11,
   libxcb,
-  libXScrnSaver,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
+  libxscrnsaver,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
   libxtst,
   ninja,
   nix-update-script,
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString x11Support ''
       substituteInPlace src/video/x11/SDL_x11vulkan.c \
-        --replace-fail 'libX11-xcb.so' '${lib.getLib libX11}/lib/libX11-xcb.so'
+        --replace-fail 'libX11-xcb.so' '${lib.getLib libx11}/lib/libX11-xcb.so'
     '';
 
   strictDeps = true;
@@ -145,14 +145,14 @@ stdenv.mkDerivation (finalAttrs: {
       wayland
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
       libxcb
-      libXScrnSaver
-      libXcursor
-      libXext
-      libXfixes
-      libXi
-      libXrandr
+      libxscrnsaver
+      libxcursor
+      libxext
+      libxfixes
+      libxi
+      libxrandr
       libxtst
     ]
     ++ [
diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index a23af7e65b96..894654a5cc98 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   glfw,
   glew,
   fftwFloat,
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     volk
     zstd
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libX11
+  ++ lib.optional stdenv.hostPlatform.isLinux libx11
   ++ lib.optional airspy_source airspy
   ++ lib.optional airspyhf_source airspyhf
   ++ lib.optional bladerf_source libbladeRF
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
index 3eba28100d6d..915985444cbe 100644
--- a/pkgs/by-name/se/segger-ozone/package.nix
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -8,11 +8,11 @@
   freetype,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXfixes,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxfixes,
+  libxrandr,
+  libxrender,
   makeDesktopItem,
 }:
 
@@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libice
     libsm
-    libX11
-    libXcursor
-    libXfixes
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxfixes
+    libxrandr
+    libxrender
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/by-name/se/sent/package.nix b/pkgs/by-name/se/sent/package.nix
index ff3126ed55e9..7e5eb64ffb54 100644
--- a/pkgs/by-name/se/sent/package.nix
+++ b/pkgs/by-name/se/sent/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   farbfeld,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   makeWrapper,
   patches ? [ ],
 }:
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/se/setbfree/package.nix b/pkgs/by-name/se/setbfree/package.nix
index 7fcde202ab9f..f479d65f2f14 100644
--- a/pkgs/by-name/se/setbfree/package.nix
+++ b/pkgs/by-name/se/setbfree/package.nix
@@ -6,7 +6,7 @@
   freetype,
   ftgl,
   libjack2,
-  libX11,
+  libx11,
   lv2,
   libGLU,
   libGL,
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     freetype
     ftgl
     libjack2
-    libX11
+    libx11
     lv2
     libGLU
     libGL
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index f259291d4346..211ae0e1a1a7 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   imlib2,
   pkg-config,
   fetchpatch,
   enableXinerama ? true,
-  libXinerama,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     imlib2
   ]
-  ++ lib.optionals enableXinerama [ libXinerama ];
+  ++ lib.optionals enableXinerama [ libxinerama ];
 
   buildFlags = [ (if enableXinerama then "xinerama=1" else "xinerama=0") ];
 
diff --git a/pkgs/by-name/se/seturgent/package.nix b/pkgs/by-name/se/seturgent/package.nix
index a5fab4bf1366..1ef409efc256 100644
--- a/pkgs/by-name/se/seturgent/package.nix
+++ b/pkgs/by-name/se/seturgent/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix
index 00ee98350a60..75172272f475 100644
--- a/pkgs/by-name/sf/sfml/package.nix
+++ b/pkgs/by-name/sf/sfml/package.nix
@@ -15,11 +15,11 @@
   libvorbis,
   miniaudio,
   udev,
-  libXi,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXrender,
+  libxi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxrender,
   libxcb-image,
 }:
 
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux udev
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXi
-    libXcursor
-    libXrandr
-    libXrender
+    libx11
+    libxi
+    libxcursor
+    libxrandr
+    libxrender
     libxcb-image
   ];
 
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index 060cb935fcd0..d03771f27d6a 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -14,10 +14,10 @@
   libvorbis,
   openal,
   udev,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxrender,
   libxcb-image,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -42,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux udev
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXcursor
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxrandr
+    libxrender
     libxcb-image
   ];
 
diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix
index 4bc66659bc2f..ec1fff454bf5 100644
--- a/pkgs/by-name/sg/sg-323/package.nix
+++ b/pkgs/by-name/sg/sg-323/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix
index 7a56dee66356..725bf31799fb 100644
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   desktop-file-utils,
   gtk3,
-  libX11,
+  libx11,
   cmake,
   imagemagick,
   pkg-config,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk3
-    libX11
+    libx11
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 1f514fabc78b..46560cf77cdd 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -8,7 +8,7 @@
   miniz,
   lz4,
   libxml2,
-  libX11,
+  libx11,
   glslang,
   unordered_dense,
   versionCheckHook,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     unordered_dense
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ]
   ++ lib.optionals withGlslang [
     # SPIRV-tools is included in glslang.
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 86c5d68a0619..a02db407cb4c 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -34,7 +34,7 @@
   libogg,
   libvorbis,
   bzip2,
-  libX11,
+  libx11,
   sdl_gamecontrollerdb,
 }:
 
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
     libogg
     libvorbis
     bzip2
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix
index 9e43feef04a0..e7b28d09d428 100644
--- a/pkgs/by-name/sh/shod/package.nix
+++ b/pkgs/by-name/sh/shod/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxft,
+  libxpm,
+  libxrandr,
+  libxrender,
   conf ? null,
 }:
 
@@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXpm
-    libXrandr
-    libXrender
+    libx11
+    libxft
+    libxpm
+    libxrandr
+    libxrender
   ];
 
   postPatch =
diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix
index 188c40e5a1cb..cc1001fac017 100644
--- a/pkgs/by-name/sh/show-midi/package.nix
+++ b/pkgs/by-name/sh/show-midi/package.nix
@@ -5,11 +5,11 @@
   pkg-config,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   makeDesktopItem,
   copyDesktopItems,
 }:
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 54b8400f40bf..d020f58a6e34 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -22,19 +22,19 @@
   freetype,
   fontconfig,
   dbus,
-  libX11,
+  libx11,
   libxshmfence,
   libxcb,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libxtst,
+  libxscrnsaver,
   nss,
   nspr,
   alsa-lib,
@@ -168,17 +168,17 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libappindicator-gtk3
     libpulseaudio
     libnotify
diff --git a/pkgs/by-name/si/sil-q/package.nix b/pkgs/by-name/si/sil-q/package.nix
index e9224b6ccbbe..98f88108758c 100644
--- a/pkgs/by-name/si/sil-q/package.nix
+++ b/pkgs/by-name/si/sil-q/package.nix
@@ -6,7 +6,7 @@
   writeScript,
   makeWrapper,
   ncurses,
-  libX11,
+  libx11,
 }:
 
 let
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     ncurses
-    libX11
+    libx11
   ];
 
   # Makefile(s) and config are not top-level
diff --git a/pkgs/by-name/si/sil/package.nix b/pkgs/by-name/si/sil/package.nix
index b9848cedb3b1..8e55947b9cbe 100644
--- a/pkgs/by-name/si/sil/package.nix
+++ b/pkgs/by-name/si/sil/package.nix
@@ -4,11 +4,11 @@
   stdenv,
   fetchzip,
   ncurses,
-  libX11,
-  libXaw,
-  libXt,
-  libXext,
-  libXmu,
+  libx11,
+  libxaw,
+  libxt,
+  libxext,
+  libxmu,
   makeWrapper,
   writeScript,
 }:
@@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     ncurses
-    libX11
-    libXaw
-    libXt
-    libXext
-    libXmu
+    libx11
+    libxaw
+    libxt
+    libxext
+    libxmu
   ];
 
   sourceRoot = "${finalAttrs.src.name}/Sil/src";
diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index 101230bf241d..15e3e81caa29 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -5,13 +5,13 @@
   plib,
   libglut,
   xorgproto,
-  libX11,
-  libXext,
-  libXi,
+  libx11,
+  libxext,
+  libxi,
   libice,
   libsm,
-  libXt,
-  libXmu,
+  libxt,
+  libxmu,
   libGLU,
   libGL,
   boost179,
@@ -46,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: {
     plib
     libglut
     xorgproto
-    libX11
-    libXext
-    libXi
+    libx11
+    libxext
+    libxi
     libice
     libsm
-    libXt
-    libXmu
+    libxt
+    libxmu
     libGLU
     libGL
     boost179
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 3379f6fef5c5..0bc5ccc3d725 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -13,7 +13,7 @@
   libjpeg,
   libpng,
   libwebp,
-  libX11,
+  libx11,
   libgbm,
   ninja,
   python3,
@@ -80,7 +80,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     libglvnd
-    libX11
+    libx11
     libgbm
   ];
 
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index d1395ac59e5e..69b04fc63b7c 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -11,7 +11,7 @@
   libGL,
   libjpeg,
   libwebp,
-  libX11,
+  libx11,
   ninja,
   python3,
   testers,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libjpeg
     libwebp
-    libX11
+    libx11
   ]
   ++ lib.optionals enableVulkan [
     vulkan-headers
diff --git a/pkgs/by-name/sk/skippy-xd/package.nix b/pkgs/by-name/sk/skippy-xd/package.nix
index fe32e56117e1..3289c5924183 100644
--- a/pkgs/by-name/sk/skippy-xd/package.nix
+++ b/pkgs/by-name/sk/skippy-xd/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   xorgproto,
-  libX11,
-  libXft,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXinerama,
+  libx11,
+  libxft,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxinerama,
   libjpeg,
   giflib,
   pkg-config,
@@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXft
-    libXcomposite
-    libXdamage
-    libXext
-    libXinerama
+    libx11
+    libxft
+    libxcomposite
+    libxdamage
+    libxext
+    libxinerama
     libjpeg
     giflib
   ];
diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix
index 02c63ae1399d..e4d13f1a453b 100644
--- a/pkgs/by-name/sk/skyemu/package.nix
+++ b/pkgs/by-name/sk/skyemu/package.nix
@@ -11,9 +11,9 @@
   alsa-lib,
   libGL,
   libGLU,
-  libX11,
-  libXi,
-  libXcursor,
+  libx11,
+  libxi,
+  libxcursor,
   lua,
   makeDesktopItem,
   copyDesktopItems,
@@ -46,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXi
-    libXcursor
+    libx11
+    libxi
+    libxcursor
     lua
   ];
 
diff --git a/pkgs/by-name/sl/slock/package.nix b/pkgs/by-name/sl/slock/package.nix
index 4cec5f07cd51..bf54026db1c5 100644
--- a/pkgs/by-name/sl/slock/package.nix
+++ b/pkgs/by-name/sl/slock/package.nix
@@ -4,9 +4,9 @@
   fetchzip,
   writeText,
   xorgproto,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   libxcrypt,
   config,
   conf ? config.slock.conf or null,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     libxcrypt
   ]
   ++ extraLibs;
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index 1d4987633000..57cee507cef3 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -8,9 +8,9 @@
   glm,
   libGLU,
   libGL,
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   icu74,
   libsm,
 }:
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     libGLU
     libGL
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
     icu74
     libsm
   ];
diff --git a/pkgs/by-name/sl/slstatus/package.nix b/pkgs/by-name/sl/slstatus/package.nix
index 1c66d88c4e1e..1bf9c9330cf1 100644
--- a/pkgs/by-name/sl/slstatus/package.nix
+++ b/pkgs/by-name/sl/slstatus/package.nix
@@ -4,10 +4,10 @@
   fetchzip,
   pkg-config,
   writeText,
-  libX11,
+  libx11,
   libxcb,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   config,
   conf ? config.slstatus.conf or null,
   patches ? config.slstatus.patches or [ ],
@@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     libxcb
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/sm/smallwm/package.nix b/pkgs/by-name/sm/smallwm/package.nix
index ecdc9678b322..225b42056917 100644
--- a/pkgs/by-name/sm/smallwm/package.nix
+++ b/pkgs/by-name/sm/smallwm/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   doxygen,
   graphviz,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   strictDeps = true;
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd2;
     mainProgram = "smallwm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix
index 85c153ae6c17..3de1113f331e 100644
--- a/pkgs/by-name/sm/smartgit/package.nix
+++ b/pkgs/by-name/sm/smartgit/package.nix
@@ -8,7 +8,7 @@
   glib,
   adwaita-icon-theme,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   which,
 }:
 let
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           gtk3
           glib
-          libXtst
+          libxtst
         ]
       } \
       --prefix SMARTGIT_JAVA_HOME : ${jre} \
diff --git a/pkgs/by-name/sm/smartsynchronize/package.nix b/pkgs/by-name/sm/smartsynchronize/package.nix
index 0b6fa30fc3a5..e0042ada9cbd 100644
--- a/pkgs/by-name/sm/smartsynchronize/package.nix
+++ b/pkgs/by-name/sm/smartsynchronize/package.nix
@@ -8,7 +8,7 @@
   glib,
   adwaita-icon-theme,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   which,
 }:
 let
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           gtk3
           glib
-          libXtst
+          libxtst
         ]
       } \
       --prefix JAVA_HOME : ${jre} \
diff --git a/pkgs/by-name/sn/snapmaker-luban/package.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix
index d577d1b0391b..261f486f0727 100644
--- a/pkgs/by-name/sn/snapmaker-luban/package.nix
+++ b/pkgs/by-name/sn/snapmaker-luban/package.nix
@@ -19,17 +19,17 @@
   gdk-pixbuf,
   libdrm,
   libgbm,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   pango,
@@ -62,10 +62,10 @@ stdenv.mkDerivation rec {
     gcc-unwrapped
     gtk3
     libdrm
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -86,22 +86,22 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
     libxshmfence
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     nspr
     nss
     libxcb
     pango
-    libXScrnSaver
+    libxscrnsaver
     udev
   ];
 
diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix
index 947e127f5323..ae6082b93820 100644
--- a/pkgs/by-name/sn/sndpeek/package.nix
+++ b/pkgs/by-name/sn/sndpeek/package.nix
@@ -7,10 +7,10 @@
   alsa-lib,
   libgbm,
   libGLU,
-  libX11,
-  libXmu,
-  libXext,
-  libXi,
+  libx11,
+  libxmu,
+  libxext,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     libGLU
     libsndfile
-    libX11
-    libXmu
-    libXext
-    libXi
+    libx11
+    libxmu
+    libxext
+    libxi
   ];
   buildFlags = [ "linux-alsa" ];
 
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 84951e4e3ac3..316d8a8dc1bd 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -6,12 +6,12 @@
   fetchFromGitHub,
   gtkmm3,
   libGLX,
-  libX11,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXv,
+  libx11,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxv,
   libepoxy,
   libpng,
   libselinux,
@@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXv
+    libx11
+    libxv
     minizip
     zlib
   ]
@@ -66,14 +66,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!withGtk) [
     libpng
-    libXext
-    libXinerama
+    libxext
+    libxinerama
   ]
   ++ lib.optionals withGtk [
     gtkmm3
     libepoxy
-    libXdmcp
-    libXrandr
+    libxdmcp
+    libxrandr
     pcre2
     portaudio
     SDL2
diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix
index 966e48993eeb..b2b7be915001 100644
--- a/pkgs/by-name/sn/snis-unwrapped/package.nix
+++ b/pkgs/by-name/sn/snis-unwrapped/package.nix
@@ -8,7 +8,7 @@
   libbsd,
   libpng,
   libvorbis,
-  libX11,
+  libx11,
   sdl2-compat,
   makeWrapper,
   lua5_2,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbsd
     libpng
     libvorbis
-    libX11
+    libx11
     sdl2-compat
     lua5_2
     glew
diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix
index 70ca9f7137e3..b65f96418d21 100644
--- a/pkgs/by-name/so/socalabs-papu/package.nix
+++ b/pkgs/by-name/so/socalabs-papu/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -65,14 +65,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-rp2a03/package.nix b/pkgs/by-name/so/socalabs-rp2a03/package.nix
index 7bee247d80ac..d7cbbcba8998 100644
--- a/pkgs/by-name/so/socalabs-rp2a03/package.nix
+++ b/pkgs/by-name/so/socalabs-rp2a03/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-sn76489/package.nix b/pkgs/by-name/so/socalabs-sn76489/package.nix
index a54c6b796bc2..85fed2b6f135 100644
--- a/pkgs/by-name/so/socalabs-sn76489/package.nix
+++ b/pkgs/by-name/so/socalabs-sn76489/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -74,14 +74,14 @@ stdenv.mkDerivation {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-voc/package.nix b/pkgs/by-name/so/socalabs-voc/package.nix
index 3be3fdd55677..d1f7e6501f43 100644
--- a/pkgs/by-name/so/socalabs-voc/package.nix
+++ b/pkgs/by-name/so/socalabs-voc/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -71,14 +71,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/soil/package.nix b/pkgs/by-name/so/soil/package.nix
index 183a1fec6e57..603665d3a364 100644
--- a/pkgs/by-name/so/soil/package.nix
+++ b/pkgs/by-name/so/soil/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchzip,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL
-    libX11
+    libx11
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/so/sonic-visualiser/package.nix b/pkgs/by-name/so/sonic-visualiser/package.nix
index d78e3f0b1703..871f2893ca1f 100644
--- a/pkgs/by-name/so/sonic-visualiser/package.nix
+++ b/pkgs/by-name/so/sonic-visualiser/package.nix
@@ -8,7 +8,7 @@
   bzip2,
   fftw,
   libjack2,
-  libX11,
+  libx11,
   liblo,
   libmad,
   lrdf,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmad
     libfishsound
     liblo
-    libX11
+    libx11
     capnproto
     liboggz
     libid3tag
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index 416359bc5717..89c44f0326da 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -8,11 +8,11 @@
   cmake,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   libopus,
   curl,
@@ -66,11 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   runtimeDependencies = [
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}";
diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix
index 1686095e904f..e71bee15ac31 100644
--- a/pkgs/by-name/so/sourcegit/package.nix
+++ b/pkgs/by-name/so/sourcegit/package.nix
@@ -8,10 +8,10 @@
   makeDesktopItem,
   libicns,
 
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
 
   git,
   xdg-utils,
@@ -52,13 +52,13 @@ buildDotnetModule (finalAttrs: {
   ];
 
   # these are dlopen-ed at runtime
-  # libXi is needed for right-click support
+  # libxi is needed for right-click support
   # not sure about what the other ones are needed for, but I'll include them anyways
   runtimeDeps = [
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
   ];
 
   # Note: users can use `.overrideAttrs` to append to this list
diff --git a/pkgs/by-name/so/soxt/package.nix b/pkgs/by-name/so/soxt/package.nix
index 31fa46242c2f..65d201b010e3 100644
--- a/pkgs/by-name/so/soxt/package.nix
+++ b/pkgs/by-name/so/soxt/package.nix
@@ -5,8 +5,8 @@
   cmake,
   coin3d,
   motif,
-  libXext,
-  libXmu,
+  libxext,
+  libxmu,
   libGLU,
   libGL,
 }:
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     motif
     libGLU
     libGL
-    libXext
-    libXmu
+    libxext
+    libxmu
   ];
 
   meta = {
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index 55b9cf96b391..5f419d4cc225 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -8,13 +8,13 @@
   iconConvTools,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
   libGL,
   freetype,
   glib,
@@ -86,13 +86,13 @@ buildDotnetModule rec {
     libGL
     freetype
     glib
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
     at-spi2-atk
     at-spi2-core
     libxkbcommon
diff --git a/pkgs/by-name/sp/spacenav-cube-example/package.nix b/pkgs/by-name/sp/spacenav-cube-example/package.nix
index abcda7c2dc3f..b4613c3e3848 100644
--- a/pkgs/by-name/sp/spacenav-cube-example/package.nix
+++ b/pkgs/by-name/sp/spacenav-cube-example/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   libspnav,
-  libX11,
+  libx11,
   mesa_glu,
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   sourceRoot = "${libspnav.src.name}/examples/cube";
 
   buildInputs = [
-    libX11
+    libx11
     mesa_glu
     libspnav
   ];
diff --git a/pkgs/by-name/sp/spacenavd/package.nix b/pkgs/by-name/sp/spacenavd/package.nix
index 3adb51aac023..54da61707864 100644
--- a/pkgs/by-name/sp/spacenavd/package.nix
+++ b/pkgs/by-name/sp/spacenavd/package.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libXext,
-  libX11,
+  libxext,
+  libx11,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "spacenavd";
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   configureFlags = [ "--disable-debug" ];
diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix
index feaf3696cbb2..409e1758a667 100644
--- a/pkgs/by-name/sp/spaghettikart/package.nix
+++ b/pkgs/by-name/sp/spaghettikart/package.nix
@@ -18,7 +18,7 @@
   pkg-config,
   libGL,
   libvorbis,
-  libX11,
+  libx11,
   libzip,
   nlohmann_json,
   SDL2,
@@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libvorbis
-    libX11
+    libx11
     libzip
     nlohmann_json
     SDL2
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index c7cb34ce513c..b135c74d7d1e 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   libbsd,
   pkg-config,
-  libXrandr,
-  libXcursor,
-  libXft,
-  libXt,
+  libxrandr,
+  libxcursor,
+  libxft,
+  libxt,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXrandr
-    libXcursor
-    libXft
-    libXt
+    libxrandr
+    libxcursor
+    libxft
+    libxt
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix
index 936b3547b319..8db85914984d 100644
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -4,19 +4,19 @@
   libGLU,
   libGL,
   libglut,
-  libX11,
+  libx11,
   plib,
   openal,
   freealut,
-  libXrandr,
+  libxrandr,
   xorgproto,
-  libXext,
+  libxext,
   libsm,
   libice,
-  libXi,
-  libXt,
-  libXrender,
-  libXxf86vm,
+  libxi,
+  libxt,
+  libxrender,
+  libxxf86vm,
   openscenegraph,
   expat,
   libpng12,
@@ -45,18 +45,18 @@ let
     libglut
   ];
   runtimeLibs = glLibs ++ [
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
-    libXext
+    libxrandr
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     openscenegraph
     expat
     libpng12
@@ -133,19 +133,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libpng12
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
+    libxrandr
     xorgproto
-    libXext
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     zlib
     bash
     expat
diff --git a/pkgs/by-name/sp/spice-autorandr/package.nix b/pkgs/by-name/sp/spice-autorandr/package.nix
index a4f50b8a4a05..c98aacf82971 100644
--- a/pkgs/by-name/sp/spice-autorandr/package.nix
+++ b/pkgs/by-name/sp/spice-autorandr/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   autoreconfHook,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation {
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/sp/spice-vdagent/package.nix b/pkgs/by-name/sp/spice-vdagent/package.nix
index 9b8fa858f0fc..813fa2eb0fe9 100644
--- a/pkgs/by-name/sp/spice-vdagent/package.nix
+++ b/pkgs/by-name/sp/spice-vdagent/package.nix
@@ -8,9 +8,9 @@
   glib,
   libpciaccess,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXfixes,
+  libxrandr,
+  libxinerama,
+  libxfixes,
   dbus,
   libdrm,
   systemd,
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
     libdrm
     libpciaccess
     libxcb
-    libXrandr
-    libXinerama
-    libXfixes
+    libxrandr
+    libxinerama
+    libxfixes
     dbus
     systemd
   ];
diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index 9d7e20309ae2..48b778eaaf7e 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -8,11 +8,11 @@
   pixman,
   alsa-lib,
   openssl,
-  libXrandr,
-  libXfixes,
-  libXext,
-  libXrender,
-  libXinerama,
+  libxrandr,
+  libxfixes,
+  libxext,
+  libxrender,
+  libxinerama,
   libjpeg,
   zlib,
   spice-protocol,
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
     cyrus_sasl
     glib
     gst_all_1.gst-plugins-base
-    libXext
-    libXfixes
-    libXinerama
-    libXrandr
-    libXrender
+    libxext
+    libxfixes
+    libxinerama
+    libxrandr
+    libxrender
     libcacard
     libjpeg
     libopus
diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index 4cc19a53bc5d..3b1a1ae00413 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -9,9 +9,9 @@
   glib,
   libice,
   libsm,
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   zlib,
 }:
 
@@ -24,9 +24,9 @@ let
     glib
     libice
     libsm
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
     zlib
   ];
 
diff --git a/pkgs/by-name/sp/spotifywm/package.nix b/pkgs/by-name/sp/spotifywm/package.nix
index a12a3f94b62b..98ba8867efb3 100644
--- a/pkgs/by-name/sp/spotifywm/package.nix
+++ b/pkgs/by-name/sp/spotifywm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxcb,
   lndir,
   makeBinaryWrapper,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
   ];
 
diff --git a/pkgs/by-name/sr/srandrd/package.nix b/pkgs/by-name/sr/srandrd/package.nix
index 7f55e8df6558..652780b2e948 100644
--- a/pkgs/by-name/sr/srandrd/package.nix
+++ b/pkgs/by-name/sr/srandrd/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxrandr,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
+    libx11
+    libxrandr
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/ss/sselp/package.nix b/pkgs/by-name/ss/sselp/package.nix
index faedce6e18c5..5a05be400c6a 100644
--- a/pkgs/by-name/ss/sselp/package.nix
+++ b/pkgs/by-name/ss/sselp/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   patchPhase = ''
     sed -i "s@/usr/local@$out@g" config.mk
-    sed -i "s@/usr/X11R6/include@${libX11}/include@g" config.mk
-    sed -i "s@/usr/X11R6/lib@${libX11}/lib@g" config.mk
+    sed -i "s@/usr/X11R6/include@${libx11}/include@g" config.mk
+    sed -i "s@/usr/X11R6/lib@${libx11}/lib@g" config.mk
   '';
 
   meta = {
diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix
index bd4e8e2ce660..9c7a823d0831 100644
--- a/pkgs/by-name/ss/ssocr/package.nix
+++ b/pkgs/by-name/ss/ssocr/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   imlib2,
-  libX11,
+  libx11,
   pkg-config,
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     imlib2
-    libX11
+    libx11
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/st/st-snazzy/package.nix b/pkgs/by-name/st/st-snazzy/package.nix
index e5521c63e293..23564c3eb836 100644
--- a/pkgs/by-name/st/st-snazzy/package.nix
+++ b/pkgs/by-name/st/st-snazzy/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   fontconfig,
   harfbuzz,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   gd,
   glib,
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   buildInputs = [
     fontconfig
     harfbuzz
-    libX11
-    libXft
+    libx11
+    libxft
     ncurses
     gd
     glib
diff --git a/pkgs/by-name/st/st/package.nix b/pkgs/by-name/st/st/package.nix
index a9df8c908d67..60f17a610e82 100644
--- a/pkgs/by-name/st/st/package.nix
+++ b/pkgs/by-name/st/st/package.nix
@@ -5,8 +5,8 @@
   pkg-config,
   fontconfig,
   freetype,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   writeText,
   config,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ];
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/st/stalin/package.nix b/pkgs/by-name/st/stalin/package.nix
index 1c341ca1166f..514e007db971 100644
--- a/pkgs/by-name/st/stalin/package.nix
+++ b/pkgs/by-name/st/stalin/package.nix
@@ -3,7 +3,7 @@
   lib,
   stdenv,
   ncompress,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncompress
-    libX11
+    libx11
   ];
 
   buildPhase = "./build ";
diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix
index ef6638ad2b24..6222d910ed2a 100644
--- a/pkgs/by-name/st/stalonetray/package.nix
+++ b/pkgs/by-name/st/stalonetray/package.nix
@@ -4,8 +4,8 @@
   docbook-xsl-ns,
   fetchFromGitHub,
   lib,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libxslt,
   stdenv,
 }:
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     docbook-xsl-ns
     docbook_xml_dtd_44
-    libX11
-    libXpm
+    libx11
+    libxpm
     libxslt
   ];
 
diff --git a/pkgs/by-name/st/stardust/package.nix b/pkgs/by-name/st/stardust/package.nix
index 6e0a0cbd493e..2066ae3f68e2 100644
--- a/pkgs/by-name/st/stardust/package.nix
+++ b/pkgs/by-name/st/stardust/package.nix
@@ -6,10 +6,10 @@
   libtiff,
   libxml2,
   SDL_compat,
-  libX11,
-  libXi,
-  libXmu,
-  libXext,
+  libx11,
+  libxi,
+  libxmu,
+  libxext,
   libGLU,
   libGL,
 }:
@@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     libxml2
     SDL_compat
-    libX11
-    libXi
-    libXmu
-    libXext
+    libx11
+    libxi
+    libxmu
+    libxext
     libGLU
     libGL
   ];
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 254bf591334d..7620b079b267 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -62,7 +62,7 @@ let
               ln -s /bin/ldconfig $out/sbin/ldconfig
             '')
 
-            # crashes on startup if it can't find libX11 locale files
+            # crashes on startup if it can't find libx11 locale files
             (pkgs.runCommand "xorg-locale" { } ''
               mkdir -p $out
               ln -s ${libx11}/share $out/share
diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix
index 62d80d9c3a0e..1a5ccb1e7446 100644
--- a/pkgs/by-name/st/stereotool/package.nix
+++ b/pkgs/by-name/st/stereotool/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   alsa-lib,
   bzip2,
   zlib,
@@ -151,11 +151,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     alsa-lib
     bzip2
     zlib
-    libXpm
+    libxpm
     libgcc
   ];
 
diff --git a/pkgs/by-name/st/stochas/package.nix b/pkgs/by-name/st/stochas/package.nix
index e46871bdb4a1..ed98735d03d2 100644
--- a/pkgs/by-name/st/stochas/package.nix
+++ b/pkgs/by-name/st/stochas/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
   libjack2,
@@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
     freetype
     alsa-lib
     libjack2
diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index fdb90a96947f..d315a82498fd 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -10,7 +10,7 @@
   gst_all_1,
   kdsingleapplication,
   lib,
-  libXdmcp,
+  libxdmcp,
   libcdio,
   libebur128,
   libidn2,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftw
     gnutls
     kdsingleapplication
-    libXdmcp
+    libxdmcp
     libcdio
     libebur128
     libidn2
diff --git a/pkgs/by-name/st/stuntrally/mygui.nix b/pkgs/by-name/st/stuntrally/mygui.nix
index 111d3fe2266d..f3d323368b6d 100644
--- a/pkgs/by-name/st/stuntrally/mygui.nix
+++ b/pkgs/by-name/st/stuntrally/mygui.nix
@@ -10,7 +10,7 @@
   libuuid,
   ois,
   ogre-next,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "mygui";
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     libuuid
     ois
     ogre-next
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/st/stuntrally/package.nix b/pkgs/by-name/st/stuntrally/package.nix
index 5bbe921d5529..d24d33ed54f2 100644
--- a/pkgs/by-name/st/stuntrally/package.nix
+++ b/pkgs/by-name/st/stuntrally/package.nix
@@ -16,7 +16,7 @@
   rapidjson,
   ogre-next,
   ninja,
-  libX11,
+  libx11,
 }:
 
 let
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     bullet
     openal
     tinyxml-2
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/st/stw/package.nix b/pkgs/by-name/st/stw/package.nix
index fee513ab3afc..ace62888fa4e 100644
--- a/pkgs/by-name/st/stw/package.nix
+++ b/pkgs/by-name/st/stw/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   fontconfig,
-  libXft,
-  libXrender,
+  libxft,
+  libxrender,
 }:
 
 stdenv.mkDerivation {
@@ -20,10 +20,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     fontconfig
-    libXft
-    libXrender
+    libxft
+    libxrender
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/st/styluslabs-write-bin/package.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix
index c6aba59ae85d..f54141952fe9 100644
--- a/pkgs/by-name/st/styluslabs-write-bin/package.nix
+++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix
@@ -3,8 +3,8 @@
   lib,
   libsForQt5,
   libglvnd,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   fetchurl,
   makeDesktopItem,
 }:
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
         libsForQt5.qtsvg # libQt5Svg.so.5
         (lib.getLib stdenv.cc.cc) # libstdc++.so.6
         libglvnd # libGL.so.1
-        libX11 # libX11.so.6
-        libXi # libXi.so.6
+        libx11 # libX11.so.6
+        libxi # libXi.so.6
       ];
     in
     ''
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
index 3fb78cb40ab7..07b36b793bb5 100644
--- a/pkgs/by-name/su/sumo/package.nix
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -14,7 +14,7 @@
   jdk,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libtiff,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     xercesc
     zlib
     python3
-    libX11
+    libx11
     libxcursor
     libxext
     libxfixes
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 78e1e0ad9382..56168f88a970 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -7,8 +7,8 @@
   copyDesktopItems,
   libglvnd,
   libjack2,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   makeDesktopItem,
   makeWrapper,
   SDL2,
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libglvnd
-    libX11
-    libXi
+    libx11
+    libxi
     SDL2
   ];
 
diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix
index 472ffd65ed0a..ad73a29dfeca 100644
--- a/pkgs/by-name/su/superTux/package.nix
+++ b/pkgs/by-name/su/superTux/package.nix
@@ -9,7 +9,7 @@
   SDL2,
   SDL2_image,
   libsm,
-  libXext,
+  libxext,
   libpng,
   freetype,
   libGLU,
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     libsm
-    libXext
+    libxext
     libpng
     freetype
     libGL
diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 4b8ea5d46fdd..8ece4444bad2 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -15,7 +15,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   harfbuzz,
   mcpp,
   wiiuse,
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libjpeg
     libpng
-    libX11
+    libx11
     harfbuzz
     mcpp
     wiiuse
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index feb160382471..85cc79dfe20b 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -8,9 +8,9 @@
   autoPatchelfHook,
   libxkbcommon,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
+  libx11,
+  libxcursor,
+  libxi,
   stdenv,
   makeWrapper,
   zenity,
@@ -43,9 +43,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wayland
     libxkbcommon
     libGL
-    libX11
-    libXcursor
-    libXi
+    libx11
+    libxcursor
+    libxi
   ];
 
   cargoHash = "sha256-E+9u7t6bLzORL2HiG4iT5pT4nGftyOgO2/eXHuQK4pQ=";
diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index daee093f35c0..0b4ce473dbc9 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -9,11 +9,11 @@
   freetype,
   libjack2,
   lv2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
 
   buildVST3 ? true,
   buildLV2 ? true,
@@ -59,11 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     freetype
     libjack2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ]
   ++ lib.optionals buildLV2 [ lv2 ];
 
diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix
index f12e5b6e2afc..4f3c2608f75f 100644
--- a/pkgs/by-name/su/surreal-engine/package.nix
+++ b/pkgs/by-name/su/surreal-engine/package.nix
@@ -9,7 +9,7 @@
   openal,
   pkg-config,
   SDL2,
-  libX11,
+  libx11,
   stdenv,
   vulkan-loader,
   wayland,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     openal
     SDL2
-    libX11
+    libx11
     vulkan-loader
     wayland
     waylandpp
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index e4609f1a1c36..99e1b459db76 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -6,7 +6,7 @@
   glib,
   libGLU,
   libice,
-  libX11,
+  libx11,
   libgbm,
   perl,
   pkg-config,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     libGLU
     libgbm
     libice
-    libX11
+    libx11
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/sv/sview/package.nix b/pkgs/by-name/sv/sview/package.nix
index 2604ba7ed0ce..2175f700478d 100644
--- a/pkgs/by-name/sv/sview/package.nix
+++ b/pkgs/by-name/sv/sview/package.nix
@@ -7,7 +7,7 @@
   lib,
   libconfig,
   libGL,
-  libXpm,
+  libxpm,
   makeFontsConf,
   makeWrapper,
   nanum,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     gtk2
     libconfig
     libGL
-    libXpm
+    libxpm
     openal
   ];
 
diff --git a/pkgs/by-name/sv/svkbd/package.nix b/pkgs/by-name/sv/svkbd/package.nix
index f8385efacd74..1cfee22d3f74 100644
--- a/pkgs/by-name/sv/svkbd/package.nix
+++ b/pkgs/by-name/sv/svkbd/package.nix
@@ -4,11 +4,11 @@
   fetchurl,
   writeText,
   pkg-config,
-  libX11,
-  libXft,
-  libXi,
-  libXinerama,
-  libXtst,
+  libx11,
+  libxft,
+  libxi,
+  libxinerama,
+  libxtst,
   layout ? "mobile-intl",
   conf ? null,
   patches ? [ ],
@@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXi
-    libXinerama
-    libXtst
+    libx11
+    libxft
+    libxi
+    libxinerama
+    libxtst
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index 23fb6516d913..7f7b1aa295c6 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -34,12 +34,12 @@
   libyaml,
 
   withGui ? false,
-  libXpm,
-  libXext,
-  libXft,
-  libXinerama,
+  libxpm,
+  libxext,
+  libxft,
+  libxinerama,
   libjpeg,
-  libXt,
+  libxt,
   libsm,
   freetype,
   fontconfig,
@@ -102,11 +102,11 @@ let
     ++ (lib.optional withPython python3)
     ++ (lib.optional withYaml libyaml)
     ++ (lib.optionals withGui' [
-      libXt
-      libXext
-      libXpm
-      libXft
-      libXinerama
+      libxt
+      libxext
+      libxpm
+      libxft
+      libxinerama
       libjpeg
       libsm
       freetype
diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix
index 830d0a78b4b2..09c4701290a6 100644
--- a/pkgs/by-name/sy/syncterm/package.nix
+++ b/pkgs/by-name/sy/syncterm/package.nix
@@ -8,7 +8,7 @@
   autoPatchelfHook,
   ncurses,
   SDL2,
-  libX11,
+  libx11,
   alsa-lib,
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoPatchelfHook
     pkg-config
     SDL2
-    libX11
+    libx11
     perl
     unzip
   ]; # SDL2 for `sdl2-config`.
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index c7ab360d0e81..37e95f1340e1 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -15,12 +15,12 @@
   libnotify,
   libice,
   libsm,
-  libX11,
+  libx11,
   libxkbfile,
-  libXi,
-  libXtst,
-  libXrandr,
-  libXinerama,
+  libxi,
+  libxtst,
+  libxrandr,
+  libxinerama,
   xkeyboard-config,
   xinput,
   avahi-compat,
@@ -73,11 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
     libsepol
     libice
     libsm
-    libX11
-    libXi
-    libXtst
-    libXrandr
-    libXinerama
+    libx11
+    libxi
+    libxtst
+    libxrandr
+    libxinerama
     libxkbfile
     xinput
     avahi-compat
diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 6d6931dc458f..49dd3d0915f6 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -1,11 +1,11 @@
 {
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   stdenv,
   lib,
   alsa-lib,
@@ -45,14 +45,14 @@ let
     glib
     gtk3
     libdrm
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
     libxkbcommon
-    libXrandr
+    libxrandr
     nspr
     nss
     pango
diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 293382bd6031..97be2f3d3650 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -7,7 +7,7 @@
   ncurses,
   SDL2,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     ncurses
     SDL2
     libGL
-    libX11
+    libx11
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 5952923e7ad3..b5fc05ea29a3 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libnotify,
   libogg,
-  libX11,
+  libx11,
   opusfile,
   pcre,
   python3,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     spirv-tools
     glew
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index 2c91d5b065c5..643a53c86a23 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -16,7 +16,7 @@
   libpaper,
   makeWrapper,
   ghostscript,
-  libXft,
+  libxft,
 }:
 
 stdenv.mkDerivation rec {
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     libpng
     gtk2-x11
     libpaper
-    libXft
+    libxft
   ];
 
   meta = {
diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 269690fdd9f7..4f69c4f9f014 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   python3,
   alsa-lib,
-  libX11,
+  libx11,
   libGLU,
   SDL2,
   lua5_3,
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       libGLU
       alsa-lib
-      libX11
+      libx11
     ]
   );
 
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index b191502d57ec..be4b431566fc 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -39,8 +39,8 @@
   at-spi2-core,
   dbus,
   libepoxy,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libpthread-stubs,
   libselinux,
   libsepol,
@@ -166,8 +166,8 @@ stdenv.mkDerivation (finalAttrs: {
     at-spi2-core
     dbus
     libepoxy
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libpthread-stubs
     libxkbcommon
     libselinux
diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix
index 1ba0cd0f7a23..ea942ec4bd7c 100644
--- a/pkgs/by-name/tg/tgpt/package.nix
+++ b/pkgs/by-name/tg/tgpt/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 buildGoModule rec {
@@ -18,7 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-Xilu4wzDkwf15LmVH0Pkk91/nDisUu66aPP0JvT4ldo=";
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 8210feeae290..6c88a58767d1 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -7,7 +7,7 @@
   jsoncpp,
   lib,
   libpng,
-  libX11,
+  libx11,
   lua5_2,
   luajit,
   meson,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftwFloat
     jsoncpp
     libpng
-    libX11
+    libx11
     lua5_2
     luajit
     SDL2
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 1a9f13363f42..61577649905e 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   SDL2,
   SDL2_image,
-  libX11,
+  libx11,
   rtaudio,
   rtmidi,
   glew,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     SDL2_image
-    libX11
+    libx11
     rtaudio
     rtmidi
     glew
diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix
index a417ad65ff47..a8fe92e72800 100644
--- a/pkgs/by-name/th/thunar-unwrapped/package.nix
+++ b/pkgs/by-name/th/thunar-unwrapped/package.nix
@@ -10,7 +10,7 @@
   libexif,
   libgudev,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   libxslt,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     xfce4-exo
     gdk-pixbuf
     gtk3
-    libX11
+    libx11
     libexif # image properties page
     libgudev
     libnotify
diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index 1c9cf9c3184c..76d7382ec097 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -10,7 +10,7 @@
   kubazip,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   janet,
   lua5_3_compat,
   quickjs,
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
     kubazip
     libGL
     libGLU
-    libX11
+    libx11
     janet
     (lua5_3_compat.withPackages (ps: [ ps.fennel ]))
     quickjs
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index b736f01cf8c3..2b20fdbc0bd3 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -26,13 +26,13 @@
   gdk-pixbuf,
   nss,
   nspr,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libxkbfile,
   pango,
   systemd,
@@ -62,13 +62,13 @@ let
     gtk4
     nss
     nspr
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXrandr
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxrandr
     libxkbfile
     pango
     pciutils
diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index b8c8ea395b34..1b8a82c2940a 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.12.2";
+  version = "1.13.0";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-kSj65fZKcOwxnMMC6GZvoXhfHqeMGHJqiXnxyiktVf4=";
+        hash = "sha256-K2CnKoQwfe1pJ8bfJOFt/OvKqRzZ3gMU2UdOSboIKtY=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-STtg/CUrawQQCJSzp3ugx9eJ0gtBB+2EkQeSHJbOoAc=";
+        hash = "sha256-DpLa7w5iVB96jVJkBlmMR2RbeDxggErvdOoKoilXLyQ=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-1aPDdPUejrjG6z+PN3y5yCZi/yFKnxX5DR9yJdSD0n0=";
+        hash = "sha256-7kpgId/ok2R2Z2hOstr2fp1cOATbbb3nPWz+ELyQAe8=";
       };
     };
     updateScript = "${
diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix
index e6f067ea2bb4..d8de9cb1b581 100644
--- a/pkgs/by-name/ti/time12/package.nix
+++ b/pkgs/by-name/ti/time12/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix
index 127f53c1c5e2..448b92660f53 100644
--- a/pkgs/by-name/ti/tint2/package.nix
+++ b/pkgs/by-name/ti/tint2/package.nix
@@ -11,15 +11,15 @@
   glib,
   imlib2,
   gtk3,
-  libXinerama,
-  libXrender,
-  libXcomposite,
-  libXdamage,
-  libX11,
-  libXrandr,
+  libxinerama,
+  libxrender,
+  libxcomposite,
+  libxdamage,
+  libx11,
+  libxrandr,
   librsvg,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libstartup_notification,
   wrapGAppsHook3,
   versionCheckHook,
@@ -64,15 +64,15 @@ stdenv.mkDerivation rec {
     glib
     imlib2
     gtk3
-    libXinerama
-    libXrender
-    libXcomposite
-    libXdamage
-    libX11
-    libXrandr
+    libxinerama
+    libxrender
+    libxcomposite
+    libxdamage
+    libx11
+    libxrandr
     librsvg
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libstartup_notification
   ];
 
diff --git a/pkgs/by-name/ti/tinywm/package.nix b/pkgs/by-name/ti/tinywm/package.nix
index 08a2003c5995..845168daa3b6 100644
--- a/pkgs/by-name/ti/tinywm/package.nix
+++ b/pkgs/by-name/ti/tinywm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-q2DEMTxIp/nwTBTGEZMHEAqQs99iJwQgimHS0YQj+eg=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   strictDeps = true;
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm
+    $CC -Wall -pedantic -I${libx11}/include tinywm.c -L${libx11}/lib -lX11 -o tinywm
 
     runHook postBuild
   '';
@@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.publicDomain;
     mainProgram = "tinywm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
index 83da8700efbb..ad63808190fb 100644
--- a/pkgs/by-name/tk/tkmm/package.nix
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -5,15 +5,15 @@
   dotnetCorePackages,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
+  libx11,
   glew,
   libGL,
   libice,
   libsm,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
 }:
 buildDotnetModule (finalAttrs: {
   pname = "Tkmm";
@@ -47,15 +47,15 @@ buildDotnetModule (finalAttrs: {
 
   runtimeDeps = [
     # Avalonia UI
-    libX11
+    libx11
     libGL
     glew
     libice
     libsm
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
   ];
 
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index 35fe2d8ab99d..91c37dbb1f8a 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -5,7 +5,7 @@
   makeDesktopItem,
   stdenv,
   gtk3,
-  libXtst,
+  libxtst,
   glib,
   zlib,
   wrapGAppsHook3,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           gtk3
-          libXtst
+          libxtst
           glib
           zlib
         ]
diff --git a/pkgs/by-name/tl/tlclient/package.nix b/pkgs/by-name/tl/tlclient/package.nix
index c6c8ec39864f..489fefcee246 100644
--- a/pkgs/by-name/tl/tlclient/package.nix
+++ b/pkgs/by-name/tl/tlclient/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoPatchelfHook,
   alsa-lib,
-  libX11,
+  libx11,
   pcsclite,
   testers,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
     pcsclite
   ];
 
diff --git a/pkgs/by-name/to/todesk/package.nix b/pkgs/by-name/to/todesk/package.nix
index fdd21d78e122..af90b505eaae 100644
--- a/pkgs/by-name/to/todesk/package.nix
+++ b/pkgs/by-name/to/todesk/package.nix
@@ -11,23 +11,23 @@
   systemdMinimal,
   glib,
   pulseaudio,
-  libXext,
-  libX11,
-  libXrandr,
+  libxext,
+  libx11,
+  libxrandr,
   glibc,
   cairo,
   libva,
   libdrm,
   coreutils,
-  libXi,
+  libxi,
   libGL,
   bash,
-  libXcomposite,
-  libXdamage,
-  libXfixes,
-  libXtst,
+  libxcomposite,
+  libxdamage,
+  libxfixes,
+  libxtst,
   nss,
-  libXxf86vm,
+  libxxf86vm,
   gtk3,
   gdk-pixbuf,
   pango,
@@ -78,26 +78,26 @@ buildFHSEnv {
     pulseaudio
     nspr
     kmod
-    libXi
+    libxi
     systemdMinimal
     glib
     libz
     bash
     coreutils
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     glibc
     libdrm
     libGL
     procps
     cairo
-    libXcomposite
-    libXdamage
-    libXfixes
-    libXtst
+    libxcomposite
+    libxdamage
+    libxfixes
+    libxtst
     nss
-    libXxf86vm
+    libxxf86vm
     gtk3
     gdk-pixbuf
     pango
diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 2385f26bd20b..f9e3f494b503 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.7.25";
+  version = "0.7.27";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tZBQE1hyKF4osDQIiqwpnhT9dxDxCPrvrOhn+Yhr86w=";
+    hash = "sha256-5rRHaeUBbhYSZ6Fi6l330SLtpoqxTGErpVUxsaeeWug=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-+Gs9+vAbYzbz/wcNApcxXahwdzCZay+vdJhFFGT5gjI=";
+  cargoHash = "sha256-B5af/Y8ysJ1NTOSsstAR9jS3k7hDbL7vcv+oNwy3HZU=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \
diff --git a/pkgs/by-name/to/tome2/package.nix b/pkgs/by-name/to/tome2/package.nix
index 6686399c3d71..4b2ce79a258b 100644
--- a/pkgs/by-name/to/tome2/package.nix
+++ b/pkgs/by-name/to/tome2/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeDesktopItem,
   ncurses,
-  libX11,
+  libx11,
   boost,
   cmake,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     ncurses
-    libX11
+    libx11
     boost
   ];
 
diff --git a/pkgs/by-name/to/tonelib-gfx/package.nix b/pkgs/by-name/to/tonelib-gfx/package.nix
index cdd5f2ed209f..75034309006b 100644
--- a/pkgs/by-name/to/tonelib-gfx/package.nix
+++ b/pkgs/by-name/to/tonelib-gfx/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -49,10 +49,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-jam/package.nix b/pkgs/by-name/to/tonelib-jam/package.nix
index d7b808e2ed81..5aad3d79c0f8 100644
--- a/pkgs/by-name/to/tonelib-jam/package.nix
+++ b/pkgs/by-name/to/tonelib-jam/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix
index 981774091780..f61ec3a94142 100644
--- a/pkgs/by-name/to/tonelib-metal/package.nix
+++ b/pkgs/by-name/to/tonelib-metal/package.nix
@@ -9,10 +9,10 @@
   libglvnd,
   libgbm,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 stdenv.mkDerivation rec {
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
index fc82137a34ad..2cf2a2ec67d7 100644
--- a/pkgs/by-name/to/tonelib-noisereducer/package.nix
+++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix
@@ -9,10 +9,10 @@
   libglvnd,
   libgbm,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 stdenv.mkDerivation rec {
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
index 69adb3fc012b..0779842bc772 100644
--- a/pkgs/by-name/to/tonelib-zoom/package.nix
+++ b/pkgs/by-name/to/tonelib-zoom/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tony/package.nix b/pkgs/by-name/to/tony/package.nix
index c09b1809b988..ac7910d332f2 100644
--- a/pkgs/by-name/to/tony/package.nix
+++ b/pkgs/by-name/to/tony/package.nix
@@ -9,7 +9,7 @@
   bzip2,
   fftw,
   fftwFloat,
-  libX11,
+  libx11,
   libfishsound,
   libid3tag,
   libjack2,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     bzip2
     fftw
     fftwFloat
-    libX11
+    libx11
     libfishsound
     libid3tag
     libjack2
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 2f986a00db31..1bd0c40c4688 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -21,11 +21,11 @@
   glib,
   gtk3,
   libxcb,
-  libX11,
-  libXext,
-  libXrender,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxrender,
+  libxt,
+  libxtst,
   libgbm,
   pango,
   pciutils,
@@ -78,11 +78,11 @@ let
       glib
       gtk3
       libxcb
-      libX11
-      libXext
-      libXrender
-      libXt
-      libXtst
+      libx11
+      libxext
+      libxrender
+      libxt
+      libxtst
       libgbm
       pango
       pciutils
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   # Firefox uses "relrhack" to manually process relocations from a fixed offset
diff --git a/pkgs/by-name/to/torcs/without-data.nix b/pkgs/by-name/to/torcs/without-data.nix
index 05634a1b7d71..fc33dbc6b556 100644
--- a/pkgs/by-name/to/torcs/without-data.nix
+++ b/pkgs/by-name/to/torcs/without-data.nix
@@ -5,19 +5,19 @@
   stdenv,
   libGLU,
   libglut,
-  libX11,
+  libx11,
   plib,
   openal,
   freealut,
-  libXrandr,
+  libxrandr,
   xorgproto,
-  libXext,
+  libxext,
   libsm,
   libice,
-  libXi,
-  libXt,
-  libXrender,
-  libXxf86vm,
+  libxi,
+  libxt,
+  libxrender,
+  libxxf86vm,
   libvorbis,
   libpng,
   zlib,
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libglut
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
+    libxrandr
     xorgproto
-    libXext
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     libpng
     zlib
     libvorbis
diff --git a/pkgs/by-name/to/touchosc/package.nix b/pkgs/by-name/to/touchosc/package.nix
index 6844b75d4341..1388e616bf40 100644
--- a/pkgs/by-name/to/touchosc/package.nix
+++ b/pkgs/by-name/to/touchosc/package.nix
@@ -10,14 +10,14 @@
   avahi,
   jack2,
   libxcb,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxxf86vm,
   libglvnd,
   zenity,
 }:
@@ -28,14 +28,14 @@ let
     avahi
     jack2
     libxcb
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxxf86vm
     libglvnd
   ];
 
diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index ae8f70a66568..c891adb4768e 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -14,8 +14,8 @@
   gst_all_1,
   gtk3,
   libsm,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libpng12,
   pango,
   zlib,
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
       cairo
       gdk-pixbuf
       alsa-lib
-      libX11
-      libXtst
+      libx11
+      libxtst
       libsm
       libpng12
       gstreamer
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index d2dfc2078473..706d43f47009 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -7,7 +7,7 @@
   unzip,
   fpc,
   lazarus,
-  libX11,
+  libx11,
   glib,
   gtk2,
   gdk-pixbuf,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     fpc
     lazarus
     stdenv.cc
-    libX11
+    libx11
     glib
     gtk2
     gdk-pixbuf
diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index 6e052a59e1d2..aecda09b5085 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "trexio";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = "trexio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mTn/46oIvBbv7X0QwDxXQJH3QyH34u487QpLferC2Uc=";
+    hash = "sha256-iESt7dXta/Enpgb418js26y5+YvROsqgxvNhgAgXd/I=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix
index 55ab0b1ddbd8..ec8ab7133de1 100644
--- a/pkgs/by-name/tr/trigger-control/package.nix
+++ b/pkgs/by-name/tr/trigger-control/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   pkg-config,
   SDL2,
-  libX11,
+  libx11,
   dbus,
   libdecor,
   libnotify,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     dbus
     libnotify
   ]
diff --git a/pkgs/by-name/tu/tunefish/package.nix b/pkgs/by-name/tu/tunefish/package.nix
index e3bb1b9fd606..f3144615ac35 100644
--- a/pkgs/by-name/tu/tunefish/package.nix
+++ b/pkgs/by-name/tu/tunefish/package.nix
@@ -8,11 +8,11 @@
   curl,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
index 8e768064b786..40acfecf6688 100644
--- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
+++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
@@ -1,8 +1,8 @@
 {
   stdenv,
   boost,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   linuxPackages,
   openssl,
   tuxclocker-plugins,
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libX11
-    libXext
+    libx11
+    libxext
     linuxPackages.nvidia_x11
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     openssl
diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix
index 11986834ee11..08ed305dd5fe 100644
--- a/pkgs/by-name/ud/udig/package.nix
+++ b/pkgs/by-name/ud/udig/package.nix
@@ -5,7 +5,7 @@
   unzip,
   makeWrapper,
   jre8,
-  libXtst,
+  libxtst,
   gdal,
 }:
 let
@@ -58,7 +58,7 @@ let
         --prefix PATH : ${jre8}/bin \
         --prefix LD_LIBRARY_PATH : ${
           lib.makeLibraryPath [
-            libXtst
+            libxtst
             gdal
           ]
         }
diff --git a/pkgs/by-name/ue/ueviewer/package.nix b/pkgs/by-name/ue/ueviewer/package.nix
index 4c2e0c29a6bf..c322b91254b6 100644
--- a/pkgs/by-name/ue/ueviewer/package.nix
+++ b/pkgs/by-name/ue/ueviewer/package.nix
@@ -6,7 +6,7 @@
   unstableGitUpdater,
   libGL,
   libpng,
-  libX11,
+  libx11,
   perl,
   SDL2,
   zlib,
@@ -64,7 +64,7 @@ gccStdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
index 57539ddbc467..5474f2b31caf 100644
--- a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -6,10 +6,10 @@
   freetype,
   lib,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   pkg-config,
   stdenv,
@@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     freetype
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
   ];
 
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
index fbc7aa820fe3..ec5c3cd23faa 100644
--- a/pkgs/by-name/uh/uhhyou-plugins/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -13,10 +13,10 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxkbcommon,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   pango,
   gtkmm3,
   sqlite,
@@ -48,10 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxkbcommon
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     pango
     gtkmm3
     sqlite
diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix
index 921dbea50b16..8c1f67546f3f 100644
--- a/pkgs/by-name/ul/ulauncher/package.nix
+++ b/pkgs/by-name/ul/ulauncher/package.nix
@@ -18,7 +18,7 @@
   wmctrl,
   xvfb-run,
   librsvg,
-  libX11,
+  libx11,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -123,7 +123,7 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=(
      "''${gappsWrapperArgs[@]}"
      --prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
-     --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}"
+     --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libx11 ]}"
      --prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1"
     )
   '';
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index e0a1510b44c0..be8907a107e4 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -18,7 +18,7 @@
   ffmpeg,
   sqlite,
   zlib,
-  libX11,
+  libx11,
   libGLU,
   libGL,
 }:
@@ -36,7 +36,7 @@ let
     sqlite
     lua
     zlib
-    libX11
+    libx11
     libGLU
     libGL
     ffmpeg
diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index 5c7fa33bb892..e99dd893ee80 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -8,11 +8,11 @@
   jre,
   libGL,
   libpulseaudio,
-  libXxf86vm,
+  libxxf86vm,
   nix-update-script,
 }:
 let
-  version = "4.19.10";
+  version = "4.19.11";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -32,7 +32,7 @@ let
     lib.optionals stdenv.hostPlatform.isLinux [
       libGL
       libpulseaudio
-      libXxf86vm
+      libxxf86vm
     ]
   );
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-4y1tsAyomjygJ+DwcCAG8fiEIljVm159qU/Y+kfkShc=";
+    hash = "sha256-GLIgiCx+bpBWKi+IewXUNIG6SDAKNvAjGie1XmFzF04=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unclutter-xfixes/package.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
index a05c5f73e6a8..7d8940ef8154 100644
--- a/pkgs/by-name/un/unclutter-xfixes/package.nix
+++ b/pkgs/by-name/un/unclutter-xfixes/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   libev,
-  libX11,
-  libXext,
-  libXi,
-  libXfixes,
+  libx11,
+  libxext,
+  libxi,
+  libxfixes,
   pkg-config,
   asciidoc,
   libxslt,
@@ -34,10 +34,10 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     libev
-    libX11
-    libXext
-    libXi
-    libXfixes
+    libx11
+    libxext
+    libxi
+    libxfixes
   ];
 
   prePatch = ''
diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix
index e7e477233c6e..ec40a9a34201 100644
--- a/pkgs/by-name/un/unclutter/package.nix
+++ b/pkgs/by-name/un/unclutter/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix
index acfa781ad979..2981fe9324c0 100644
--- a/pkgs/by-name/un/unicon-lang/package.nix
+++ b/pkgs/by-name/un/unicon-lang/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  libX11,
+  libx11,
   libxcrypt,
   fetchFromGitHub,
   coreutils,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     # compression
     zlib
     # graphics
-    libX11
+    libx11
     libjpeg
     libpng
     libxft
diff --git a/pkgs/by-name/un/unigine-heaven/package.nix b/pkgs/by-name/un/unigine-heaven/package.nix
index 86fac20ca258..f423f9a7455c 100644
--- a/pkgs/by-name/un/unigine-heaven/package.nix
+++ b/pkgs/by-name/un/unigine-heaven/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   freetype,
   fontconfig,
-  libXrender,
-  libXinerama,
+  libxrender,
+  libxinerama,
   autoPatchelfHook,
   libglvnd,
   openal,
@@ -81,14 +81,14 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     stdenv.cc.cc
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     freetype
     fontconfig
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unigine-valley/package.nix b/pkgs/by-name/un/unigine-valley/package.nix
index 4fc86d00920d..ceee9a8a9341 100644
--- a/pkgs/by-name/un/unigine-valley/package.nix
+++ b/pkgs/by-name/un/unigine-valley/package.nix
@@ -13,11 +13,11 @@
   # Runtime dependencies
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   openal,
 }:
@@ -57,11 +57,11 @@ stdenv.mkDerivation rec {
     stdenv.cc.cc # libstdc++.so.6
     fontconfig
     freetype
-    libX11
-    libXext
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     openal
   ];
diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
index 5ae151e0cf69..20684058b43f 100644
--- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
+++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
@@ -16,7 +16,7 @@
   curl,
   libcpr,
   rapidjson,
-  libX11,
+  libx11,
   libGL,
   writeShellScriptBin,
   makeDesktopItem,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libcpr
     rapidjson
-    libX11
+    libx11
     libGL
   ];
 
diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index 509412e7bb7e..5d0df2057ed9 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -20,7 +20,7 @@
   libpng,
   libvorbis,
   libwebp,
-  libX11,
+  libx11,
   lua5,
   makeDesktopItem,
   ncurses,
@@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
     libvorbis
     libjpeg
     libwebp
-    libX11
+    libx11
     libpng
   ];
 
diff --git a/pkgs/by-name/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix
index aaabeb07d765..1c2611612547 100644
--- a/pkgs/by-name/up/upwork/package.nix
+++ b/pkgs/by-name/up/upwork/package.nix
@@ -23,18 +23,18 @@
   libnotify,
   libpulseaudio,
   libuuid,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libXtst,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -80,18 +80,18 @@ stdenv.mkDerivation rec {
     libdrm
     libnotify
     libuuid
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXScrnSaver
-    libXtst
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxscrnsaver
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/ur/urbanterror/package.nix b/pkgs/by-name/ur/urbanterror/package.nix
index c62e29c643ba..bb74f59058c3 100644
--- a/pkgs/by-name/ur/urbanterror/package.nix
+++ b/pkgs/by-name/ur/urbanterror/package.nix
@@ -10,7 +10,7 @@
   libGL,
   libGLU,
   openal,
-  libXxf86vm,
+  libxxf86vm,
   SDL,
   makeDesktopItem,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     openal
-    libXxf86vm
+    libxxf86vm
     SDL
   ];
 
diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index 93dde51e5590..0fbeb6c3b387 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   autoPatchelfHook,
   bluez,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   makeWrapper,
   versionCheckHook,
 }:
@@ -49,8 +49,8 @@ stdenv.mkDerivation (
       install -m755 -D urserver $out/bin/urserver
       wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
-          libX11
-          libXtst
+          libx11
+          libxtst
           bluez
         ]
       }"
diff --git a/pkgs/by-name/us/usbimager/package.nix b/pkgs/by-name/us/usbimager/package.nix
index 89f8183ff24b..8529626ef100 100644
--- a/pkgs/by-name/us/usbimager/package.nix
+++ b/pkgs/by-name/us/usbimager/package.nix
@@ -9,7 +9,7 @@
   withUdisks ? stdenv.hostPlatform.isLinux,
   udisks,
   glib,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       udisks
       glib
     ]
-    ++ lib.optional (!withLibui) libX11
+    ++ lib.optional (!withLibui) libx11
     ++ lib.optional withLibui gtk3;
   # libui is bundled with the source of usbimager as a compiled static library
 
diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index a345c3fd4be7..cd3b190fc216 100644
--- a/pkgs/by-name/ut/utox/package.nix
+++ b/pkgs/by-name/ut/utox/package.nix
@@ -9,14 +9,14 @@
   filter-audio,
   dbus,
   libvpx,
-  libX11,
+  libx11,
   openal,
   freetype,
   libv4l,
-  libXrender,
+  libxrender,
   fontconfig,
-  libXext,
-  libXft,
+  libxext,
+  libxft,
   libsodium,
   libopus,
 }:
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
     libtoxcore
     dbus
     libvpx
-    libX11
+    libx11
     openal
     freetype
     libv4l
-    libXrender
+    libxrender
     fontconfig
-    libXext
-    libXft
+    libxext
+    libxft
     filter-audio
     libsodium
     libopus
diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
index b68eee97b3b5..7a70c78eeecd 100644
--- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
+++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
@@ -8,7 +8,7 @@
   cmrt,
   libdrm,
   libva,
-  libX11,
+  libx11,
   libGL,
   wayland,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmrt
     libdrm
     libva
-    libX11
+    libx11
     libGL
     wayland
   ];
diff --git a/pkgs/by-name/va/vaporizer2/package.nix b/pkgs/by-name/va/vaporizer2/package.nix
index 6e4a34bfc4c5..9a55bf040731 100644
--- a/pkgs/by-name/va/vaporizer2/package.nix
+++ b/pkgs/by-name/va/vaporizer2/package.nix
@@ -10,11 +10,11 @@
   fontconfig,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
 }:
 
@@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
   ];
 
diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix
index fa5f38169374..dc8156624e77 100644
--- a/pkgs/by-name/va/vatprism/package.nix
+++ b/pkgs/by-name/va/vatprism/package.nix
@@ -9,12 +9,12 @@
   libxkbcommon,
   wayland,
   fontconfig,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXxf86vm,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxxf86vm,
+  libxtst,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -23,12 +23,12 @@ let
     libGL
     libxkbcommon
     wayland
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXxf86vm
-    libXtst
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxxf86vm
+    libxtst
     fontconfig
   ];
   jdkWithFX = jdk.override { enableJavaFX = true; };
diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix
index b4fe9e3022e4..fd067b02cf67 100644
--- a/pkgs/by-name/vd/vdrift/package.nix
+++ b/pkgs/by-name/vd/vdrift/package.nix
@@ -10,7 +10,7 @@
   SDL2,
   SDL2_image,
   libvorbis,
-  libX11,
+  libx11,
   bullet,
   curl,
   gettext,
@@ -50,7 +50,7 @@ let
       SDL2
       SDL2_image
       libvorbis
-      libX11
+      libx11
       bullet
       curl
       gettext
diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 0b45c268d75b..8de755084a98 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -10,10 +10,10 @@
   libxcb,
   libxkbcommon,
   autoPatchelfHook,
-  libX11,
-  libXi,
-  libXcursor,
-  libXrandr,
+  libx11,
+  libxi,
+  libxcursor,
+  libxrandr,
   wayland,
   stdenv,
 }:
@@ -95,10 +95,10 @@ rustPlatform.buildRustPackage {
   appendRunpaths = [
     (lib.makeLibraryPath (
       [
-        libX11
-        libXi
-        libXcursor
-        libXrandr
+        libx11
+        libxi
+        libxcursor
+        libxrandr
         vulkan-loader
       ]
       ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [
diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix
index 1efef3bad90c..4f81c29e1ffe 100644
--- a/pkgs/by-name/ve/vengi-tools/package.nix
+++ b/pkgs/by-name/ve/vengi-tools/package.nix
@@ -20,7 +20,7 @@
   libjpeg,
   libuuid,
   libuv,
-  libX11,
+  libx11,
   lua5_4,
   lzfse,
   opencl-headers,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     lua5_4
     lzfse
     SDL2
-    libX11
+    libx11
     SDL2_mixer
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
diff --git a/pkgs/by-name/vi/vibrantlinux/package.nix b/pkgs/by-name/vi/vibrantlinux/package.nix
index 84be8c2ed8fb..829666b98960 100644
--- a/pkgs/by-name/vi/vibrantlinux/package.nix
+++ b/pkgs/by-name/vi/vibrantlinux/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libvibrant,
   libxcb,
-  libXrandr,
+  libxrandr,
   pkg-config,
   qt6,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libvibrant
     libxcb
-    libXrandr
+    libxrandr
     qt6.qtbase
     qt6.qttools
   ];
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index b92b6f240396..35b81960e4da 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -5,7 +5,7 @@
   perl, # used to generate help tags
   pkg-config,
   ncurses,
-  libX11,
+  libx11,
   file,
   which,
   groff,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     ncurses
-    libX11
+    libx11
     file
     which
     groff
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index d66545cf1488..321c3fc7453d 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -8,7 +8,7 @@
   buildPackages,
   libGLU,
   libepoxy,
-  libX11,
+  libx11,
   libdrm,
   libgbm,
   libva,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGLU
-    libX11
+    libx11
     libdrm
     libgbm
   ]
diff --git a/pkgs/by-name/vi/virtual-ans/package.nix b/pkgs/by-name/vi/virtual-ans/package.nix
index 47063e9cd9b0..4bf5860f28b2 100644
--- a/pkgs/by-name/vi/virtual-ans/package.nix
+++ b/pkgs/by-name/vi/virtual-ans/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libGL,
   alsa-lib,
   SDL2,
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
-    libX11
-    libXi
+    libx11
+    libxi
     libGL
     alsa-lib
     SDL2
diff --git a/pkgs/by-name/vi/virtualglLib/package.nix b/pkgs/by-name/vi/virtualglLib/package.nix
index 3160ac60d939..5511583165c3 100644
--- a/pkgs/by-name/vi/virtualglLib/package.nix
+++ b/pkgs/by-name/vi/virtualglLib/package.nix
@@ -5,9 +5,9 @@
   cmake,
   libGL,
   libGLU,
-  libXv,
-  libXtst,
-  libXi,
+  libxv,
+  libxtst,
+  libxi,
   libjpeg_turbo,
   fltk_1_3,
   libxcb-keysyms,
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     fltk_1_3
-    libXv
-    libXtst
-    libXi
+    libxv
+    libxtst
+    libxi
     libxcb-keysyms
     opencl-headers
     opencl-clhpp
diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix
index 6cec848b1bc8..8975e006dc86 100644
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@@ -14,7 +14,7 @@
   libpng,
   librealsense,
   libxml2,
-  libX11,
+  libx11,
   nlohmann_json,
   #ogre,
   openblas,
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     librealsense
-    libX11
+    libx11
     libxml2
     nlohmann_json
     #ogre
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 22eda1bbf2cd..3f92c5b75827 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -4,21 +4,21 @@
   coreutils,
   fetchurl,
   zlib,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libsm,
   libice,
   libxkbcommon,
   libxshmfence,
-  libXfixes,
-  libXt,
-  libXi,
-  libXcursor,
-  libXScrnSaver,
-  libXcomposite,
-  libXdamage,
-  libXtst,
-  libXrandr,
+  libxfixes,
+  libxt,
+  libxi,
+  libxcursor,
+  libxscrnsaver,
+  libxcomposite,
+  libxdamage,
+  libxtst,
+  libxrandr,
   alsa-lib,
   dbus,
   cups,
@@ -29,8 +29,8 @@
   libGL,
   freetype,
   fontconfig,
-  libXft,
-  libXrender,
+  libxft,
+  libxrender,
   libxcb,
   expat,
   libuuid,
@@ -104,23 +104,23 @@ stdenv.mkDerivation rec {
     stdenv.cc.cc
     stdenv.cc.libc
     zlib
-    libX11
-    libXt
-    libXext
+    libx11
+    libxt
+    libxext
     libsm
     libice
     libxcb
     libxkbcommon
     libxshmfence
-    libXi
-    libXft
-    libXcursor
-    libXfixes
-    libXScrnSaver
-    libXcomposite
-    libXdamage
-    libXtst
-    libXrandr
+    libxi
+    libxft
+    libxcursor
+    libxfixes
+    libxscrnsaver
+    libxcomposite
+    libxdamage
+    libxtst
+    libxrandr
     atk
     at-spi2-atk
     at-spi2-core
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
     qt6.qtwayland
     freetype
     fontconfig
-    libXrender
+    libxrender
     libuuid
     expat
     glib
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 4526c16e0c61..8a77dc8faf11 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -10,7 +10,7 @@
   git,
   SDL2,
   SDL2_ttf,
-  libX11,
+  libx11,
   freetype,
   harfbuzz,
   ffmpeg,
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     SDL2_ttf
     freetype
     harfbuzz
diff --git a/pkgs/by-name/vk/vkeybd/package.nix b/pkgs/by-name/vk/vkeybd/package.nix
index a44cf7774087..c27e80df0311 100644
--- a/pkgs/by-name/vk/vkeybd/package.nix
+++ b/pkgs/by-name/vk/vkeybd/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   alsa-lib,
-  libX11,
+  libx11,
   makeWrapper,
   tcl,
   tk,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
     tcl
     tk
   ];
diff --git a/pkgs/by-name/vk/vkquake/package.nix b/pkgs/by-name/vk/vkquake/package.nix
index b71f9e69af97..dc9bc3ed1d37 100644
--- a/pkgs/by-name/vk/vkquake/package.nix
+++ b/pkgs/by-name/vk/vkquake/package.nix
@@ -9,7 +9,7 @@
   libmpg123,
   libopus,
   libvorbis,
-  libX11,
+  libx11,
   makeWrapper,
   meson,
   moltenvk,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmpg123
     libopus
     libvorbis
-    libX11
+    libx11
     opusfile
     vulkan-loader
   ]
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 2ad8eba462cc..595062e3cb95 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -22,9 +22,9 @@
   harfbuzz,
   libGL,
   libsm,
-  libXext,
-  libXinerama,
-  libXpm,
+  libxext,
+  libxinerama,
+  libxpm,
   libarchive,
   libass,
   libbluray-full,
@@ -203,9 +203,9 @@ stdenv.mkDerivation (finalAttrs: {
     protobuf
   ]
   ++ optionals skins2Support [
-    libXext
-    libXinerama
-    libXpm
+    libxext
+    libxinerama
+    libxpm
   ]
   ++ optionals waylandSupport [
     wayland
diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix
index e5f8e60a236b..423d9d54acd1 100644
--- a/pkgs/by-name/vn/vncrec/package.nix
+++ b/pkgs/by-name/vn/vncrec/package.nix
@@ -2,18 +2,18 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   xorgproto,
   imake,
   gccmakedep,
-  libXt,
-  libXmu,
-  libXaw,
-  libXext,
+  libxt,
+  libxmu,
+  libxaw,
+  libxext,
   libsm,
   libice,
-  libXpm,
-  libXp,
+  libxpm,
+  libxp,
 }:
 
 stdenv.mkDerivation {
@@ -41,16 +41,16 @@ stdenv.mkDerivation {
     gccmakedep
   ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXt
-    libXmu
-    libXaw
-    libXext
+    libxt
+    libxmu
+    libxaw
+    libxext
     libsm
     libice
-    libXpm
-    libXp
+    libxpm
+    libxp
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix
index fe84e8ff612d..6bb7e40a4b83 100644
--- a/pkgs/by-name/vo/vokoscreen-ng/package.nix
+++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   gst_all_1,
-  libX11,
+  libx11,
   pipewire,
   pulseaudio,
   qt6,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gst_all_1.gstreamer
-    libX11
+    libx11
     pulseaudio
     qt6.qtbase
     qt6.qtmultimedia
diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix
index fdc6315d5364..583c87ab741d 100644
--- a/pkgs/by-name/vp/vpv/package.nix
+++ b/pkgs/by-name/vp/vpv/package.nix
@@ -8,7 +8,7 @@
   libpng,
   libtiff,
   libjpeg,
-  libX11,
+  libx11,
   SDL2,
   gdal,
   octave,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libjpeg
-    libX11
+    libx11
     SDL2
     gdal
     octave
diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix
index 91f4d7393b16..ab390744efa4 100644
--- a/pkgs/by-name/vu/vulkan-cts/package.nix
+++ b/pkgs/by-name/vu/vulkan-cts/package.nix
@@ -11,9 +11,9 @@
   libglvnd,
   libffi,
   libpng,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libxcb,
   makeWrapper,
   mesa,
@@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     libglvnd
     libpng
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libxcb
     vulkan-headers
     vulkan-utility-libraries
diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index 33d131bd0444..1be76857c00f 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -8,8 +8,8 @@
   vulkan-headers,
   vulkan-utility-libraries,
   jq,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libxcb,
   wayland,
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     vulkan-headers
     vulkan-utility-libraries
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     libxcb
     wayland
   ];
diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
index a2353225f015..05a0ad593043 100644
--- a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
+++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   cmake,
   fetchFromGitHub,
-  libX11,
+  libx11,
   meson,
   ninja,
   pkg-config,
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   buildInputs = [
     vulkan-headers
     vulkan-loader
-    libX11
+    libx11
     wayland
   ];
 
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 26662b96b944..a0f31bfc1014 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libxcb,
-  libXrandr,
+  libxrandr,
   wayland,
   moltenvk,
   vulkan-headers,
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ]
   ++ lib.optionals enableX11 [
-    libX11
+    libx11
     libxcb
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 929fc1ac8e41..89c59d98e8e2 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -7,9 +7,9 @@
   jq,
   expat,
   jsoncpp,
-  libX11,
-  libXdmcp,
-  libXrandr,
+  libx11,
+  libxdmcp,
+  libxrandr,
   libffi,
   libxcb,
   pkg-config,
@@ -48,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     expat
     jsoncpp
-    libX11
-    libXdmcp
-    libXrandr
+    libx11
+    libxdmcp
+    libxrandr
     libffi
     libxcb
     valijson
diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index d1457da17e48..826602ba462e 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -8,11 +8,11 @@
   python3,
   glslang,
   libffi,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXrandr,
+  libxdmcp,
+  libxrandr,
   vulkan-headers,
   vulkan-loader,
   vulkan-volk,
@@ -50,11 +50,11 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libffi
-    libX11
-    libXau
+    libx11
+    libxau
     libxcb
-    libXdmcp
-    libXrandr
+    libxdmcp
+    libxrandr
     wayland
     wayland-protocols
   ]
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 1e7c668f3597..5e4834e111a2 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -9,11 +9,11 @@
   jq,
   glslang,
   libffi,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXrandr,
+  libxdmcp,
+  libxrandr,
   spirv-headers,
   spirv-tools,
   vulkan-headers,
@@ -53,10 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-utility-libraries
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXau
-    libXdmcp
-    libXrandr
+    libx11
+    libxau
+    libxdmcp
+    libxrandr
     libffi
     libxcb
     wayland
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 1c9e0af62736..9014f39f8256 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -11,7 +11,7 @@
   graphicsSupport ? !stdenv.hostPlatform.isDarwin,
   imlib2,
   x11Support ? graphicsSupport,
-  libX11,
+  libx11,
   mouseSupport ? !stdenv.hostPlatform.isDarwin,
   gpm-ncurses,
   perl,
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional sslSupport openssl
   ++ lib.optional mouseSupport gpm-ncurses
   ++ lib.optional graphicsSupport imlib2
-  ++ lib.optional x11Support libX11;
+  ++ lib.optional x11Support libx11;
 
   postInstall = lib.optionalString graphicsSupport ''
     ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix
index 342acb401faa..4ca8a12233fe 100644
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -13,7 +13,7 @@
   python3,
   x11Support ? true,
   libxcb,
-  libX11,
+  libx11,
   waylandSupport ? true,
   wayland,
   wayland-protocols,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     libglvnd
   ]
   ++ lib.optionals x11Support [
-    libX11
+    libx11
     libxcb
   ]
   ++ lib.optionals waylandSupport [
diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix
index 5e27d5ce4727..05d52847eac5 100644
--- a/pkgs/by-name/wa/wallutils/package.nix
+++ b/pkgs/by-name/wa/wallutils/package.nix
@@ -2,10 +2,10 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
-  libXcursor,
-  libXmu,
-  libXpm,
+  libx11,
+  libxcursor,
+  libxmu,
+  libxpm,
   libheif,
   pkg-config,
   wayland,
@@ -38,10 +38,10 @@ buildGoModule (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXmu
-    libXpm
+    libx11
+    libxcursor
+    libxmu
+    libxpm
     libheif
     wayland
     xbitmaps
diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
index 2d30f69e808d..563b36c14961 100644
--- a/pkgs/by-name/wa/wargus/stratagus.nix
+++ b/pkgs/by-name/wa/wargus/stratagus.nix
@@ -7,7 +7,7 @@
   zlib,
   bzip2,
   libpng,
-  libX11,
+  libx11,
   lua5_1,
   toluapp,
   SDL2,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     SDL2_mixer
     libGL
-    libX11
+    libx11
   ];
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow"
diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix
index 4399deb01d2c..2fff926f9ce7 100644
--- a/pkgs/by-name/wa/warpd/package.nix
+++ b/pkgs/by-name/wa/warpd/package.nix
@@ -8,13 +8,13 @@
   libxkbcommon,
   wayland,
   withX ? true,
-  libXi,
-  libXinerama,
-  libXft,
-  libXfixes,
-  libXtst,
-  libX11,
-  libXext,
+  libxi,
+  libxinerama,
+  libxft,
+  libxfixes,
+  libxtst,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
       wayland
     ]
     ++ lib.optionals withX [
-      libXi
-      libXinerama
-      libXft
-      libXfixes
-      libXtst
-      libX11
-      libXext
+      libxi
+      libxinerama
+      libxft
+      libxfixes
+      libxtst
+      libx11
+      libxext
     ];
 
   makeFlags = [
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 52882ba5eb85..5fa0b5fc964e 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -11,12 +11,12 @@
   gtk3,
   pango,
   cairo,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libgbm,
   expat,
   libxcb,
@@ -80,12 +80,12 @@ let
       gtk3
       pango
       cairo
-      libX11
-      libXcomposite
-      libXdamage
-      libXext
-      libXfixes
-      libXrandr
+      libx11
+      libxcomposite
+      libxdamage
+      libxext
+      libxfixes
+      libxrandr
       libgbm
       expat
       libxcb
diff --git a/pkgs/by-name/wa/wayst/package.nix b/pkgs/by-name/wa/wayst/package.nix
index 05e73c7c2913..73d75c4b7e36 100644
--- a/pkgs/by-name/wa/wayst/package.nix
+++ b/pkgs/by-name/wa/wayst/package.nix
@@ -7,8 +7,8 @@
   freetype,
   fontconfig,
   libGL,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libxcb,
   libxkbcommon,
   utf8proc,
@@ -54,12 +54,12 @@ stdenv.mkDerivation {
 
   buildInputs = [
     fontconfig
-    libX11
+    libx11
     freetype
     libGL
     libxcb
     libxkbcommon
-    libXrandr
+    libxrandr
     utf8proc
     wayland
   ];
diff --git a/pkgs/by-name/wa/wayv/package.nix b/pkgs/by-name/wa/wayv/package.nix
index 9fd3516d8f88..95fc56a6c183 100644
--- a/pkgs/by-name/wa/wayv/package.nix
+++ b/pkgs/by-name/wa/wayv/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "wayv";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postInstall = ''
     make -C doc install
diff --git a/pkgs/by-name/wa/wayvr/package.nix b/pkgs/by-name/wa/wayvr/package.nix
index 60cac3211124..9bb8e1bbcf27 100644
--- a/pkgs/by-name/wa/wayvr/package.nix
+++ b/pkgs/by-name/wa/wayvr/package.nix
@@ -3,9 +3,9 @@
   dbus,
   fetchFromGitHub,
   lib,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   libxcb,
   libxkbcommon,
   nix-update-script,
@@ -44,9 +44,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     alsa-lib
     dbus
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     libxcb
     libxkbcommon
     openssl
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 3834e5e1db41..aa6bdf928fc4 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -33,16 +33,16 @@
   nss,
   pango,
   zlib,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxshmfence,
   libxcb-util,
   libxcb-image,
@@ -52,7 +52,7 @@
   p7zip,
   onetbb,
   wayland,
-  libXScrnSaver,
+  libxscrnsaver,
 }:
 
 stdenv.mkDerivation rec {
@@ -99,20 +99,20 @@ stdenv.mkDerivation rec {
     libxcb
     libxkbcommon
     libxcrypt-legacy
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libxshmfence
     libxcb-util
     libxcb-image
-    libXScrnSaver
+    libxscrnsaver
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index fe1c81ce22a2..5e5af35f1809 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -43,7 +43,7 @@
   webpSupport ? true,
   libwebp,
   xwaylandSupport ? true,
-  libXcursor,
+  libxcursor,
   xwayland,
 }:
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional webpSupport libwebp
   ++ lib.optionals xwaylandSupport [
-    libXcursor
+    libxcursor
     libxcb-cursor
     xwayland
   ];
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index f025c6940b10..dc80579ddf0b 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -5,7 +5,7 @@
   fontconfig,
   installShellFiles,
   libGL,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   ncurses,
@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
     libxcb
     libxkbcommon
     wayland
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index a03610ff5c6e..2e1bc381e9dc 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -4,7 +4,7 @@
   stdenv,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
+  libx11,
   libxcb,
   qt5,
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     qt5.qtwebengine
   ];
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index f22d0c7a9614..dd96258bb042 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -25,7 +25,7 @@
   asio,
   libsm,
   libice,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     libsm # XXX: these should be propagated by SDL2?
     libice
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libXext;
+  ++ lib.optional stdenv.hostPlatform.isLinux libxext;
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/wi/wily/package.nix b/pkgs/by-name/wi/wily/package.nix
index dec22616c48f..fd23f70a641d 100644
--- a/pkgs/by-name/wi/wily/package.nix
+++ b/pkgs/by-name/wi/wily/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   patches = [ ./fix-gcc14-build.patch ];
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 7d06b697c4a1..0fa99d80fa09 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  libXrandr,
+  libxrandr,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXrandr
+    libxrandr
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/wi/windowlab/package.nix b/pkgs/by-name/wi/windowlab/package.nix
index 1b5fc35d533b..8349fbc67139 100644
--- a/pkgs/by-name/wi/windowlab/package.nix
+++ b/pkgs/by-name/wi/windowlab/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
 }:
 
 let
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
index f9f435b845b5..6de621633e44 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
@@ -3,9 +3,9 @@
   stdenv,
   alsa-lib,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   pkg-config,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
index 206d3eba4d3a..7a6add268f52 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,15 +15,15 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/cputnik/src";
 
   buildInputs = [
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   preBuild = ''
     makeFlagsArray+=(
-      INCS="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
-      LIBS="-L${libX11}/lib -L${libXext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext"
+      INCS="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include"
+      LIBS="-L${libx11}/lib -L${libxext}/lib -L${libxpm}/lib -lX11 -lXpm -lXext"
     )
   '';
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
index 92a9b9d38ee5..3001bef81392 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
@@ -4,9 +4,9 @@
   autoreconfHook,
   dockapps-sources,
   font-util,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   mkfontdir,
   pkg-config,
 }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     font-util
     mkfontdir
   ];
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
index de423fc01ff1..03671dd51353 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,16 +15,16 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmCalClock";
 
   buildInputs = [
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   preBuild = ''
     makeFlagsArray+=(
       CC="cc"
-      INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
-      LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"
+      INCDIR="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include"
+      LIBDIR="-I${libx11}/lib -I${libxext}/lib -I${libxpm}/lib"
     )
   '';
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
index 93bb86503226..67fc33d1ce4c 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXpm,
-  libXext,
+  libx11,
+  libxpm,
+  libxext,
   libdockapp,
 }:
 
@@ -16,9 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmcube/wmcube";
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     libdockapp
   ];
 
@@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
           CC="${stdenv.cc.targetPrefix}cc"
           PREFIX="${placeholder "out"}"
           VERSION="${finalAttrs.version}"
-          LIBDIR="-L${lib.getLib libX11}/lib -L${lib.getLib libXext}/lib \
-    -L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib"
-          INCDIR="-I${lib.getDev libX11}/lib -I${lib.getDev libXext}/lib \
-    -I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib"
+          LIBDIR="-L${lib.getLib libx11}/lib -L${lib.getLib libxext}/lib \
+    -L${lib.getLib libxpm}/lib -L${lib.getLib libdockapp}/lib"
+          INCDIR="-I${lib.getDev libx11}/lib -I${lib.getDev libxext}/lib \
+    -I${lib.getDev libxpm}/lib -I${lib.getDev libdockapp}/lib"
           LIBS="-lm -lXpm -lXext -lX11 -ldockapp"
         )
   '';
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
index 0782c4ffbbea..0bfeb962f4b4 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXpm,
-  libXext,
+  libx11,
+  libxpm,
+  libxext,
   libdockapp,
 }:
 
@@ -16,9 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmsm.app/wmsm";
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     libdockapp
   ];
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
index 4d59166b2c8c..2adaac2d6944 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXfixes,
-  libXmu,
-  libXpm,
+  libx11,
+  libxext,
+  libxfixes,
+  libxmu,
+  libxpm,
   pkg-config,
 }:
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXfixes
-    libXmu
-    libXpm
+    libx11
+    libxext
+    libxfixes
+    libxmu
+    libxpm
   ];
 
   meta = {
diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix
index f5eef14cdf0e..3787e2d0c9e0 100644
--- a/pkgs/by-name/wi/windowmaker/package.nix
+++ b/pkgs/by-name/wi/windowmaker/package.nix
@@ -6,14 +6,14 @@
   callPackage,
   pkg-config,
   imagemagick,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXmu,
-  libXpm,
-  libXrandr,
-  libXres,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxmu,
+  libxpm,
+  libxrandr,
+  libxres,
   libexif,
   libjpeg,
   libpng,
@@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     giflib
     imagemagick
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXmu
-    libXpm
-    libXrandr
-    libXres
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxmu
+    libxpm
+    libxrandr
+    libxres
     libexif
     libjpeg
     libpng
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index ceae12fdae2d..8a0dac1d20f3 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -29,8 +29,8 @@
   libpulseaudio,
   librsvg,
   libva,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   makeDesktopItem,
   nix-update-script,
   nlohmann_json,
@@ -115,8 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     harfbuzz
     libGL
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     openxr-loader
     shaderc
     systemd
diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix
index 2a529a3c62a1..2bacf54729d9 100644
--- a/pkgs/by-name/wl/wlay/package.nix
+++ b/pkgs/by-name/wl/wlay/package.nix
@@ -5,9 +5,9 @@
   cmake,
   extra-cmake-modules,
   glfw3,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libepoxy,
   libffi,
   libxcb,
@@ -37,9 +37,9 @@ stdenv.mkDerivation {
 
   buildInputs = [
     glfw3
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libepoxy
     libffi
     libxcb
diff --git a/pkgs/by-name/wm/wmctrl/package.nix b/pkgs/by-name/wm/wmctrl/package.nix
index f6198c42e6f3..ae236690dc61 100644
--- a/pkgs/by-name/wm/wmctrl/package.nix
+++ b/pkgs/by-name/wm/wmctrl/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   glib,
   pkg-config,
-  libXmu,
+  libxmu,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ glib.dev ];
   buildInputs = [
-    libX11
-    libXmu
+    libx11
+    libxmu
     glib
   ];
 
diff --git a/pkgs/by-name/wm/wmderland/package.nix b/pkgs/by-name/wm/wmderland/package.nix
index a875587b932f..d64c266b548f 100644
--- a/pkgs/by-name/wm/wmderland/package.nix
+++ b/pkgs/by-name/wm/wmderland/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libnotify,
-  libX11,
+  libx11,
   xorgproto,
   nixosTests,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     description = "Modern and minimal X11 tiling window manager";
     homepage = "https://github.com/aesophor/wmderland";
     license = lib.licenses.mit;
-    platforms = libX11.meta.platforms;
+    platforms = libx11.meta.platforms;
     maintainers = with lib.maintainers; [ takagiy ];
     mainProgram = "wmderland";
   };
diff --git a/pkgs/by-name/wm/wmderlandc/package.nix b/pkgs/by-name/wm/wmderlandc/package.nix
index 87e63dec4199..ec3bb2c4e144 100644
--- a/pkgs/by-name/wm/wmderlandc/package.nix
+++ b/pkgs/by-name/wm/wmderlandc/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/wm/wmfs/package.nix b/pkgs/by-name/wm/wmfs/package.nix
index 6f17819533f1..273c2c920d85 100644
--- a/pkgs/by-name/wm/wmfs/package.nix
+++ b/pkgs/by-name/wm/wmfs/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
-  libXinerama,
-  libXrandr,
-  libXpm,
-  libXft,
+  libx11,
+  libxinerama,
+  libxrandr,
+  libxpm,
+  libxft,
   imlib2,
 }:
 stdenv.mkDerivation {
@@ -35,11 +35,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
-    libXrandr
-    libXpm
-    libXft
+    libx11
+    libxinerama
+    libxrandr
+    libxpm
+    libxft
   ];
 
   preConfigure = "substituteInPlace configure --replace '-lxft' '-lXft'";
diff --git a/pkgs/by-name/wm/wmii/package.nix b/pkgs/by-name/wm/wmii/package.nix
index ad9105498f73..bd43465c19a9 100644
--- a/pkgs/by-name/wm/wmii/package.nix
+++ b/pkgs/by-name/wm/wmii/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   dash,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libixp,
   pkg-config,
   txt2tags,
@@ -57,12 +57,12 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     dash
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrandr
+    libxrender
     libixp
     txt2tags
     which
diff --git a/pkgs/by-name/wm/wmname/package.nix b/pkgs/by-name/wm/wmname/package.nix
index 4ba2bd581c13..287934da6db5 100644
--- a/pkgs/by-name/wm/wmname/package.nix
+++ b/pkgs/by-name/wm/wmname/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace Makefile --replace "@strip" "#@strip"
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [ "CC:=$(CC)" ];
 
diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
index 481a0e5f6998..7e78c4a877b4 100644
--- a/pkgs/by-name/wo/wolf-shaper/package.nix
+++ b/pkgs/by-name/wo/wolf-shaper/package.nix
@@ -7,7 +7,7 @@
   libx11,
   liblo,
   libGL,
-  libXcursor,
+  libxcursor,
   pkg-config,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     liblo
     libGL
-    libXcursor
+    libxcursor
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix
index bea0b9bef9d2..3dbf8c2c0670 100644
--- a/pkgs/by-name/wo/wordgrinder/package.nix
+++ b/pkgs/by-name/wo/wordgrinder/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   makeWrapper,
   lua52Packages,
-  libXft,
+  libxft,
   ncurses,
   ninja,
   readline,
@@ -51,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXft
+    libxft
   ];
 
   # To be able to find <Xft.h>
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libxft.dev}/include/X11";
 
   # Binaries look for LuaFileSystem library (lfs.so) at runtime
   postInstall = ''
diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix
index 6f0f3100c10f..5122742e2e93 100644
--- a/pkgs/by-name/wo/worker/package.nix
+++ b/pkgs/by-name/wo/worker/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xJxdOb6eEr8suf3u/vouYCGzTFugJpLtoKyCMeuoJv4=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   outputs = [
     "out"
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "worker";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index 545b4f511f19..730c297d0f04 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -12,8 +12,8 @@
   pkg-config,
   libice,
   libsm,
-  libXScrnSaver,
-  libXtst,
+  libxscrnsaver,
+  libxtst,
   gobject-introspection,
   glib,
   glibmm,
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libice
     libsm
-    libXScrnSaver
-    libXtst
+    libxscrnsaver
+    libxtst
     glib
     glibmm
     gtkmm3
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 9fd4bf665814..96d93fe3e942 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -8,9 +8,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   pkg-config,
   xorgproto,
   compat28 ? false,
@@ -54,9 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     xorgproto
   ]
   ++ lib.optional withCurl curl
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index b7bf1124e034..2dfffacec6a9 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -10,9 +10,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libnotify,
   libpng,
   libsecret,
@@ -72,9 +72,9 @@ stdenv.mkDerivation (finalAttrs: {
     gspell # wxTextCtrl spell checking
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libnotify # wxNotificationMessage backend
     libsecret # wxSecretStore backend
     libxkbcommon # proper key codes in key events
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index 973fd1d4a91c..10e67f63b2c4 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -10,9 +10,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libnotify,
   libpng,
   libsecret,
@@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     gspell # wxTextCtrl spell checking
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libnotify # wxNotificationMessage backend
     libsecret # wxSecretStore backend
     libxkbcommon # proper key codes in key events
diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix
index 5a9f4acfb32a..1e2d2956389e 100644
--- a/pkgs/by-name/x1/x11basic/package.nix
+++ b/pkgs/by-name/x1/x11basic/package.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   fig2dev,
   readline,
-  libX11,
+  libx11,
   bluez,
   SDL2,
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     readline
-    libX11
+    libx11
     SDL2
     bluez
   ];
diff --git a/pkgs/by-name/x2/x2goclient/package.nix b/pkgs/by-name/x2/x2goclient/package.nix
index 93d118d415a9..623e5aec9e0f 100644
--- a/pkgs/by-name/x2/x2goclient/package.nix
+++ b/pkgs/by-name/x2/x2goclient/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   bash,
   cups,
-  libXpm,
+  libxpm,
   libssh,
   nx-libs,
   openldap,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cups
-    libXpm
+    libxpm
     libssh
     libsForQt5.phonon
     libsForQt5.qtbase
diff --git a/pkgs/by-name/x2/x2x/package.nix b/pkgs/by-name/x2/x2x/package.nix
index 76c14aa14330..51466f358818 100644
--- a/pkgs/by-name/x2/x2x/package.nix
+++ b/pkgs/by-name/x2/x2x/package.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenv,
-  libX11,
-  libXtst,
-  libXext,
+  libx11,
+  libxtst,
+  libxext,
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -26,10 +26,10 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXtst
-    libXext
-    libXi
+    libx11
+    libxtst
+    libxext
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index d3e9c89bbad3..9ea5e52faa47 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -5,10 +5,10 @@
   fetchurl,
   m4,
   expat,
-  libX11,
-  libXt,
-  libXaw,
-  libXmu,
+  libx11,
+  libxt,
+  libxaw,
+  libxmu,
   bdftopcf,
   mkfontdir,
   font-adobe-100dpi,
@@ -67,10 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     expat
-    libX11
-    libXt
-    libXaw
-    libXmu
+    libx11
+    libxt
+    libxaw
+    libxmu
     bdftopcf
     mkfontdir
     font-adobe-100dpi
diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix
index f9a2230c0d69..7ea6a8480e92 100644
--- a/pkgs/by-name/xa/Xaw3d/package.nix
+++ b/pkgs/by-name/xa/Xaw3d/package.nix
@@ -5,11 +5,11 @@
   bison,
   flex,
   pkg-config,
-  libXext,
-  libXmu,
-  libXpm,
-  libXp,
-  libXt,
+  libxext,
+  libxmu,
+  libxpm,
+  libxp,
+  libxt,
   xorgproto,
 }:
 
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     flex
   ];
   buildInputs = [
-    libXext
-    libXpm
-    libXp
+    libxext
+    libxpm
+    libxp
   ];
   propagatedBuildInputs = [
-    libXmu
-    libXt
+    libxmu
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xa/xannotate/package.nix b/pkgs/by-name/xa/xannotate/package.nix
index fc367100f01b..ddaecf7ddb4a 100644
--- a/pkgs/by-name/xa/xannotate/package.nix
+++ b/pkgs/by-name/xa/xannotate/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "xannotate";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-BDRg29ojBOFfwD4hx3XbcabwrJn2nfgI9Ld27FaQoRw=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Tool to scribble over X windows";
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index e662f887d8e2..953197d2a914 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -9,10 +9,10 @@
   libepoxy,
   font-util,
   libGL,
-  libX11,
-  libXau,
-  libXdmcp,
-  libXfont2,
+  libx11,
+  libxau,
+  libxdmcp,
+  libxfont_2,
   libdrm,
   libgcrypt,
   libmd,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalPackages: rec {
     libepoxy
     font-util
     libGL
-    libX11
-    libXau
-    libXdmcp
-    libXfont2
+    libx11
+    libxau
+    libxdmcp
+    libxfont_2
     libdrm
     libgcrypt
     libmd
diff --git a/pkgs/by-name/xa/xautocfg/package.nix b/pkgs/by-name/xa/xautocfg/package.nix
index c03ac7c28ac2..836bcd4bafff 100644
--- a/pkgs/by-name/xa/xautocfg/package.nix
+++ b/pkgs/by-name/xa/xautocfg/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXi
+    libx11
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xa/xautolock/package.nix b/pkgs/by-name/xa/xautolock/package.nix
index b9f50f0a15f8..e2692cadf667 100644
--- a/pkgs/by-name/xa/xautolock/package.nix
+++ b/pkgs/by-name/xa/xautolock/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
-  libXScrnSaver,
+  libx11,
+  libxext,
+  libxscrnsaver,
   xorgproto,
   nixosTests,
 }:
@@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXScrnSaver
+    libx11
+    libxext
+    libxscrnsaver
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xa/xautomation/package.nix b/pkgs/by-name/xa/xautomation/package.nix
index dbcaf6f39798..682e8b41fc94 100644
--- a/pkgs/by-name/xa/xautomation/package.nix
+++ b/pkgs/by-name/xa/xautomation/package.nix
@@ -4,10 +4,10 @@
   fetchurl,
   pkg-config,
   libpng,
-  libX11,
-  libXext,
-  libXi,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,10 +21,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libpng
-    libX11
-    libXext
-    libXi
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxtst
   ];
 
   meta = {
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 6e9e1c0e6067..5daee7f40e87 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -4,17 +4,17 @@
   fetchurl,
   ncurses,
   libjpeg,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   alsa-lib,
   aalib,
-  libXft,
+  libxft,
   xorgproto,
   libv4l,
   libfs,
-  libXaw,
-  libXpm,
-  libXext,
+  libxaw,
+  libxpm,
+  libxext,
   libsm,
   libice,
   perl,
@@ -38,17 +38,17 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ncurses
     libjpeg
-    libX11
-    libXt
-    libXft
+    libx11
+    libxt
+    libxft
     xorgproto
     libfs
     perl
     alsa-lib
     aalib
-    libXaw
-    libXpm
-    libXext
+    libxaw
+    libxpm
+    libxext
     libsm
     libice
     libv4l
diff --git a/pkgs/by-name/xb/xbanish/package.nix b/pkgs/by-name/xb/xbanish/package.nix
index e21b8cdf5137..572c7bb0778c 100644
--- a/pkgs/by-name/xb/xbanish/package.nix
+++ b/pkgs/by-name/xb/xbanish/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
-  libXt,
-  libXfixes,
-  libXext,
+  libx11,
+  libxi,
+  libxt,
+  libxfixes,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xbanish";
 
   buildInputs = [
-    libX11
-    libXi
-    libXt
-    libXfixes
-    libXext
+    libx11
+    libxi
+    libxt
+    libxfixes
+    libxext
   ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/xb/xbattbar/package.nix b/pkgs/by-name/xb/xbattbar/package.nix
index 8ab71fa18b8e..88f82d032183 100644
--- a/pkgs/by-name/xb/xbattbar/package.nix
+++ b/pkgs/by-name/xb/xbattbar/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
+  libx11,
   perl,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZrJAyDyvlUmNpxBC06yrzBJ7vhrZY4+GbfBDQoF+h4M=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # remove the APM checker binary, make the sys checker
   # script the default. Rationale: checking battery status by /proc/apm is
diff --git a/pkgs/by-name/xb/xbill/package.nix b/pkgs/by-name/xb/xbill/package.nix
index 71cf40ee90a4..bba06f21d954 100644
--- a/pkgs/by-name/xb/xbill/package.nix
+++ b/pkgs/by-name/xb/xbill/package.nix
@@ -6,9 +6,9 @@
   copyDesktopItems,
   fetchpatch,
   fetchurl,
-  libX11,
-  libXpm,
-  libXt,
+  libx11,
+  libxpm,
+  libxt,
   motif,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXpm
-    libXt
+    libx11
+    libxpm
+    libxt
     motif
   ];
 
diff --git a/pkgs/by-name/xb/xbindkeys/package.nix b/pkgs/by-name/xb/xbindkeys/package.nix
index 47bb0fa045c6..87e4974df50f 100644
--- a/pkgs/by-name/xb/xbindkeys/package.nix
+++ b/pkgs/by-name/xb/xbindkeys/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoreconfHook,
   pkg-config,
-  libX11,
+  libx11,
   guile,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     guile
   ];
 
diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix
index c0fb2a389fff..46a7a5660bb5 100644
--- a/pkgs/by-name/xb/xboard/package.nix
+++ b/pkgs/by-name/xb/xboard/package.nix
@@ -3,17 +3,17 @@
   stdenv,
   fetchurl,
   fetchpatch,
-  libX11,
+  libx11,
   xorgproto,
-  libXt,
-  libXaw,
+  libxt,
+  libxaw,
   libsm,
   libice,
-  libXmu,
-  libXext,
+  libxmu,
+  libxext,
   gnuchess,
   texinfo,
-  libXpm,
+  libxpm,
   pkg-config,
   librsvg,
   cairo,
@@ -42,17 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXt
-    libXaw
+    libxt
+    libxaw
     libsm
     libice
-    libXmu
-    libXext
+    libxmu
+    libxext
     gnuchess
     texinfo
-    libXpm
+    libxpm
     librsvg
     cairo
     pango
diff --git a/pkgs/by-name/xb/xbomb/package.nix b/pkgs/by-name/xb/xbomb/package.nix
index 8c640cd2b325..db4863dede5e 100644
--- a/pkgs/by-name/xb/xbomb/package.nix
+++ b/pkgs/by-name/xb/xbomb/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXaw,
+  libx11,
+  libxaw,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXaw
+    libx11
+    libxaw
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix
index 196a54bcc1d6..37b91a7dd9e3 100644
--- a/pkgs/by-name/xc/xcalib/package.nix
+++ b/pkgs/by-name/xc/xcalib/package.nix
@@ -4,9 +4,9 @@
   fetchFromCodeberg,
   cmake,
   ninja,
-  libX11,
-  libXxf86vm,
-  libXrandr,
+  libx11,
+  libxxf86vm,
+  libxrandr,
   samurai,
   fetchpatch,
 }:
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXxf86vm
-    libXrandr
+    libx11
+    libxxf86vm
+    libxrandr
     samurai
   ];
 
diff --git a/pkgs/by-name/xc/xcape/package.nix b/pkgs/by-name/xc/xcape/package.nix
index fbcf5e6b4f58..b13d3d4e7779 100644
--- a/pkgs/by-name/xc/xcape/package.nix
+++ b/pkgs/by-name/xc/xcape/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -23,10 +23,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcbutilxrm/package.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix
index a5ade77c1250..ab227c2a54fa 100644
--- a/pkgs/by-name/xc/xcbutilxrm/package.nix
+++ b/pkgs/by-name/xc/xcbutilxrm/package.nix
@@ -6,7 +6,7 @@
   m4,
   libxcb,
   libxcb-util,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcb
     libxcb-util
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/xc/xchainkeys/package.nix b/pkgs/by-name/xc/xchainkeys/package.nix
index 4650b13cdc7a..84d9ba874de1 100644
--- a/pkgs/by-name/xc/xchainkeys/package.nix
+++ b/pkgs/by-name/xc/xchainkeys/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     homepage = "http://henning-bekel.de/xchainkeys/";
diff --git a/pkgs/by-name/xc/xclicker/package.nix b/pkgs/by-name/xc/xclicker/package.nix
index 2a1e05350083..85281bd0d8c9 100644
--- a/pkgs/by-name/xc/xclicker/package.nix
+++ b/pkgs/by-name/xc/xclicker/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   wrapGAppsHook3,
   gtk3,
-  libXtst,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk3
-    libXtst
+    libxtst
   ];
 
   mesonBuildType = "release";
diff --git a/pkgs/by-name/xc/xclip/package.nix b/pkgs/by-name/xc/xclip/package.nix
index 9ee63bd97221..058e28e314b6 100644
--- a/pkgs/by-name/xc/xclip/package.nix
+++ b/pkgs/by-name/xc/xclip/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libXmu,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ libXmu ];
+  buildInputs = [ libxmu ];
 
   meta = {
     description = "Tool to access the X clipboard from a console application";
diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix
index 804c85f1bf5d..1f30e53039b2 100644
--- a/pkgs/by-name/xc/xcolor/package.nix
+++ b/pkgs/by-name/xc/xcolor/package.nix
@@ -3,8 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxcb,
   python3,
   installShellFiles,
@@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libxcb
   ];
 
diff --git a/pkgs/by-name/xc/xconq/package.nix b/pkgs/by-name/xc/xconq/package.nix
index b96e22314b06..1bc52e5be5c0 100644
--- a/pkgs/by-name/xc/xconq/package.nix
+++ b/pkgs/by-name/xc/xconq/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
   cpio,
   xorgproto,
-  libX11,
-  libXmu,
-  libXaw,
-  libXt,
+  libx11,
+  libxmu,
+  libxaw,
+  libxt,
   tcl,
   tk,
-  libXext,
+  libxext,
   fontconfig,
   makeWrapper,
 }:
@@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cpio
     xorgproto
-    libX11
-    libXmu
-    libXaw
-    libXt
+    libx11
+    libxmu
+    libxaw
+    libxt
     tcl
     tk
-    libXext
+    libxext
     fontconfig
   ];
 
diff --git a/pkgs/by-name/xc/xcruiser/package.nix b/pkgs/by-name/xc/xcruiser/package.nix
index e37436dc7552..52b92812390e 100644
--- a/pkgs/by-name/xc/xcruiser/package.nix
+++ b/pkgs/by-name/xc/xcruiser/package.nix
@@ -4,10 +4,10 @@
   fetchurl,
   gccmakedep,
   imake,
-  libXt,
-  libXaw,
-  libXpm,
-  libXext,
+  libxt,
+  libxaw,
+  libxpm,
+  libxext,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
   buildInputs = [
-    libXt
-    libXaw
-    libXpm
-    libXext
+    libxt
+    libxaw
+    libxpm
+    libxext
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcursor-themes/package.nix b/pkgs/by-name/xc/xcursor-themes/package.nix
index 628d9b71baf6..ca48f0f9a14b 100644
--- a/pkgs/by-name/xc/xcursor-themes/package.nix
+++ b/pkgs/by-name/xc/xcursor-themes/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Default set of cursor themes for use with libXcursor.";
+    description = "Default set of cursor themes for use with libxcursor.";
     homepage = "https://gitlab.freedesktop.org/xorg/data/cursors";
     license = lib.licenses.x11;
     maintainers = [ ];
diff --git a/pkgs/by-name/xc/xcursorgen/package.nix b/pkgs/by-name/xc/xcursorgen/package.nix
index 19f65724d1bf..42eca7ba4808 100644
--- a/pkgs/by-name/xc/xcursorgen/package.nix
+++ b/pkgs/by-name/xc/xcursorgen/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "prepares X11 cursor sets for use with libXcursor";
+    description = "prepares X11 cursor sets for use with libxcursor";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen";
     license = lib.licenses.hpndSellVariant;
     mainProgram = "xcursorgen";
diff --git a/pkgs/by-name/xc/xcwd/package.nix b/pkgs/by-name/xc/xcwd/package.nix
index b206010dfbdb..f151a90827b2 100644
--- a/pkgs/by-name/xc/xcwd/package.nix
+++ b/pkgs/by-name/xc/xcwd/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [ "prefix=$(out)" ];
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 034a0ed121d3..e817afe245de 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -17,14 +17,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-5U0xjVEGrOZzw7WnQRvoQe4VuWJ9drV3kNV/ogZQJio=";
+    hash = "sha256-ZTGQs3rPhl9tByqdwLWDUnQJczdAbK0FlohoRhd7afo=";
   };
 
   cargoHash = "sha256-99MGWfZrDOav77SRI7c5V21JTfkq7ejC7x+ZiQ5J0Yw=";
diff --git a/pkgs/by-name/xd/xdotool/package.nix b/pkgs/by-name/xd/xdotool/package.nix
index 780d424c17f9..818556389ec1 100644
--- a/pkgs/by-name/xd/xdotool/package.nix
+++ b/pkgs/by-name/xd/xdotool/package.nix
@@ -3,14 +3,14 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   perl,
-  libXtst,
+  libxtst,
   xorgproto,
-  libXi,
-  libXinerama,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
-    libXinerama
+    libxi
+    libxinerama
     libxkbcommon
-    libXext
+    libxext
   ];
 
   preBuild = ''
diff --git a/pkgs/by-name/xe/xearth/package.nix b/pkgs/by-name/xe/xearth/package.nix
index ee54beb0e534..4b2c81eef0ff 100644
--- a/pkgs/by-name/xe/xearth/package.nix
+++ b/pkgs/by-name/xe/xearth/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   imake,
   gccmakedep,
-  libXt,
-  libXext,
+  libxt,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXt
-    libXext
+    libxt
+    libxext
   ];
 
   installFlags = [
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index eae263bfe633..a311ad0681bc 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -5,10 +5,10 @@
   autoreconfHook,
   pkg-config,
   util-macros,
-  libX11,
-  libXaw,
-  libXmu,
-  libXt,
+  libx11,
+  libxaw,
+  libxmu,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,10 +36,10 @@ stdenv.mkDerivation rec {
     util-macros
   ];
   buildInputs = [
-    libX11
-    libXaw
-    libXmu
-    libXt
+    libx11
+    libxaw
+    libxmu
+    libxt
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix
index 5b71936462a4..306e44f8765c 100644
--- a/pkgs/by-name/xf/xf86-input-wacom/package.nix
+++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix
@@ -4,12 +4,12 @@
   autoreconfHook,
   fetchFromGitHub,
   xorgproto,
-  libX11,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   ncurses,
   pixman,
   pkg-config,
@@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     ncurses
     udev
     util-macros
diff --git a/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix b/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
index 91228bf7e6ba..e00f688648c7 100644
--- a/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
@@ -10,8 +10,8 @@
   wrapGAppsHook3,
   glib,
   gtk3,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libxfce4ui,
   libxfce4util,
   qrencode,
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
-    libXtst
+    libx11
+    libxtst
     libxfce4ui
     libxfce4util
     qrencode
diff --git a/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix b/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
index 3253513edaa9..f4b41cf177fc 100644
--- a/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
@@ -10,8 +10,8 @@
   glib,
   gtk3,
   gtk-layer-shell,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libxfce4ui,
   libxfce4util,
   libxfce4windowing,
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     gtk-layer-shell
-    libX11
-    libXi
+    libx11
+    libxi
     libxfce4ui
     libxfce4util
     libxfce4windowing
diff --git a/pkgs/by-name/xf/xfce4-notifyd/package.nix b/pkgs/by-name/xf/xfce4-notifyd/package.nix
index d046c546c25d..8c06e8af00d3 100644
--- a/pkgs/by-name/xf/xfce4-notifyd/package.nix
+++ b/pkgs/by-name/xf/xfce4-notifyd/package.nix
@@ -13,7 +13,7 @@
   gtk-layer-shell,
   libcanberra-gtk3,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   sqlite,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libcanberra-gtk3
     libnotify
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     sqlite
diff --git a/pkgs/by-name/xf/xfce4-screensaver/package.nix b/pkgs/by-name/xf/xfce4-screensaver/package.nix
index fb60ab05a706..a4cefb0fc5c2 100644
--- a/pkgs/by-name/xf/xfce4-screensaver/package.nix
+++ b/pkgs/by-name/xf/xfce4-screensaver/package.nix
@@ -14,9 +14,9 @@
   garcon,
   glib,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXrandr,
+  libx11,
+  libxscrnsaver,
+  libxrandr,
   libwnck,
   libxfce4ui,
   libxfce4util,
@@ -64,9 +64,9 @@ stdenv.mkDerivation (finalAttrs: {
     garcon
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXrandr
+    libx11
+    libxscrnsaver
+    libxrandr
     libwnck
     libxfce4ui
     libxfce4util
diff --git a/pkgs/by-name/xf/xfce4-screenshooter/package.nix b/pkgs/by-name/xf/xfce4-screenshooter/package.nix
index d539966335bd..c6165a7fc7d5 100644
--- a/pkgs/by-name/xf/xfce4-screenshooter/package.nix
+++ b/pkgs/by-name/xf/xfce4-screenshooter/package.nix
@@ -12,10 +12,10 @@
   xfce4-exo,
   gtk3,
   gtk-layer-shell,
-  libX11,
-  libXext,
-  libXfixes,
-  libXtst,
+  libx11,
+  libxext,
+  libxfixes,
+  libxtst,
   libxfce4ui,
   libxfce4util,
   wayland,
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     xfce4-exo
     gtk3
     gtk-layer-shell
-    libX11
-    libXext
-    libXfixes
-    libXtst
+    libx11
+    libxext
+    libxfixes
+    libxtst
     libxfce4ui
     libxfce4util
     wayland
diff --git a/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
index 7a9a7e5689e1..68d1bee5b77a 100644
--- a/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
@@ -9,8 +9,8 @@
   wrapGAppsHook3,
   glib,
   gtk3,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
-    libXext
+    libx11
+    libxext
     libxfce4ui
     libxfce4util
     xfce4-panel
diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index 5e87e9d0be48..2b9cea1288ea 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -13,8 +13,8 @@
   gtk-layer-shell,
   glib,
   libnotify,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libxfce4ui,
   libxfce4util,
   libxklavier,
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gtk-layer-shell
     libnotify
-    libX11
-    libXext
+    libx11
+    libxext
     libxfce4ui
     libxfce4util
     libxklavier
diff --git a/pkgs/by-name/xf/xfce4-taskmanager/package.nix b/pkgs/by-name/xf/xfce4-taskmanager/package.nix
index f6e5273c7282..01eccbfb52b8 100644
--- a/pkgs/by-name/xf/xfce4-taskmanager/package.nix
+++ b/pkgs/by-name/xf/xfce4-taskmanager/package.nix
@@ -13,8 +13,8 @@
   libxfce4util,
   xfconf,
   libwnck,
-  libX11,
-  libXmu,
+  libx11,
+  libxmu,
   gitUpdater,
 }:
 
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxfce4util
     xfconf
     libwnck
-    libX11
-    libXmu
+    libx11
+    libxmu
   ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-taskmanager-"; };
diff --git a/pkgs/by-name/xf/xfce4-terminal/package.nix b/pkgs/by-name/xf/xfce4-terminal/package.nix
index 7eaf3d0cefc4..6ae02810edcf 100644
--- a/pkgs/by-name/xf/xfce4-terminal/package.nix
+++ b/pkgs/by-name/xf/xfce4-terminal/package.nix
@@ -13,7 +13,7 @@
   gtk3,
   gtk-layer-shell,
   libutempter,
-  libX11,
+  libx11,
   libxfce4ui,
   pcre2,
   vte,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gtk-layer-shell
     libutempter
-    libX11
+    libx11
     libxfce4ui
     pcre2
     vte
diff --git a/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix b/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
index 317edc3bb139..f3c191904838 100644
--- a/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   glib,
   gtk3,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     xfce4-panel
diff --git a/pkgs/by-name/xf/xfd/package.nix b/pkgs/by-name/xf/xfd/package.nix
index 8c570195f841..89457f93a8c7 100644
--- a/pkgs/by-name/xf/xfd/package.nix
+++ b/pkgs/by-name/xf/xfd/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xfd-(.*)" ]; };
 
   meta = {
-    description = "X font display utility, using either the X11 core protocol or libXft2.";
+    description = "X font display utility, using either the X11 core protocol or libxft.";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xfd";
     license = lib.licenses.mitOpenGroup;
     mainProgram = "xfd";
diff --git a/pkgs/by-name/xf/xfdashboard/package.nix b/pkgs/by-name/xf/xfdashboard/package.nix
index 29df0de640a1..0529e2325824 100644
--- a/pkgs/by-name/xf/xfdashboard/package.nix
+++ b/pkgs/by-name/xf/xfdashboard/package.nix
@@ -9,10 +9,10 @@
   wrapGAppsHook3,
   clutter,
   gettext,
-  libXcomposite,
-  libXinerama,
-  libXdamage,
-  libX11,
+  libxcomposite,
+  libxinerama,
+  libxdamage,
+  libx11,
   libwnck,
   libxfce4ui,
   libxfce4util,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     garcon
     glib
     gtk3
-    libX11
-    libXcomposite
-    libXdamage
-    libXinerama
+    libx11
+    libxcomposite
+    libxdamage
+    libxinerama
     libwnck
     libxfce4ui
     libxfce4util
diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index fd2e3ca1b263..0b9450e70ba2 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -5,13 +5,13 @@
   fetchpatch,
   makeWrapper,
   imagemagick,
-  libXpm,
-  libXmu,
-  libXi,
-  libXp,
+  libxpm,
+  libxmu,
+  libxi,
+  libxp,
   Xaw3d,
-  libXaw,
-  libXft,
+  libxaw,
+  libxft,
   fig2dev,
 }:
 
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXpm
-    libXmu
-    libXi
-    libXp
+    libxpm
+    libxmu
+    libxi
+    libxp
     Xaw3d
-    libXaw
-    libXft
+    libxaw
+    libxft
   ];
 
   # Upstream-accepted patches for C23 compatibility from Gentoo and Debian
diff --git a/pkgs/by-name/xf/xfractint/package.nix b/pkgs/by-name/xf/xfractint/package.nix
index 1c29c8b6bccd..0fc031909258 100644
--- a/pkgs/by-name/xf/xfractint/package.nix
+++ b/pkgs/by-name/xf/xfractint/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
 }:
 stdenv.mkDerivation rec {
   pname = "xfractint";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/xf/xfwm4/package.nix b/pkgs/by-name/xf/xfwm4/package.nix
index ed8e2fa7632b..383d89c15353 100644
--- a/pkgs/by-name/xf/xfwm4/package.nix
+++ b/pkgs/by-name/xf/xfwm4/package.nix
@@ -10,12 +10,12 @@
   dbus-glib,
   libepoxy,
   gtk3,
-  libXdamage,
+  libxdamage,
   libstartup_notification,
   libxfce4ui,
   libxfce4util,
   libwnck,
-  libXpresent,
+  libxpresent,
   xfconf,
   gitUpdater,
 }:
@@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-glib
     libepoxy
     gtk3
-    libXdamage
+    libxdamage
     libstartup_notification
     libxfce4ui
     libxfce4util
     libwnck
-    libXpresent
+    libxpresent
     xfconf
   ];
 
diff --git a/pkgs/by-name/xg/xgalagapp/package.nix b/pkgs/by-name/xg/xgalagapp/package.nix
index 36535de44ad8..ff246a9dfc0c 100644
--- a/pkgs/by-name/xg/xgalagapp/package.nix
+++ b/pkgs/by-name/xg/xgalagapp/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   buildFlags = [
diff --git a/pkgs/by-name/xg/xgeometry-select/package.nix b/pkgs/by-name/xg/xgeometry-select/package.nix
index 9e9eac5cfbbc..3421e66a2bda 100644
--- a/pkgs/by-name/xg/xgeometry-select/package.nix
+++ b/pkgs/by-name/xg/xgeometry-select/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildPhase = ''
     gcc -Wall -lX11 ${finalAttrs.src} -o xgeometry-select
diff --git a/pkgs/by-name/xi/xiccd/package.nix b/pkgs/by-name/xi/xiccd/package.nix
index 72751da6d3b9..d5923698086b 100644
--- a/pkgs/by-name/xi/xiccd/package.nix
+++ b/pkgs/by-name/xi/xiccd/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libXrandr,
+  libxrandr,
   glib,
   colord,
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXrandr
+    libxrandr
     glib
     colord
   ];
diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index db5043e00776..9e3d9d07b6b4 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -8,10 +8,10 @@
   flac,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXinerama,
-  libXv,
+  libx11,
+  libxext,
+  libxinerama,
+  libxv,
   libcaca,
   libcdio,
   libmng,
@@ -59,14 +59,14 @@ stdenv.mkDerivation (finalAttrs: {
     flac
     libGL
     libGLU
-    libX11
-    libX11
-    libXext
-    libXext
-    libXinerama
-    libXinerama
-    libXv
-    libXv
+    libx11
+    libx11
+    libxext
+    libxext
+    libxinerama
+    libxinerama
+    libxv
+    libxv
     libcaca
     libcdio
     libmng
diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index fa40ebbd5867..3efd0356c230 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -3,13 +3,13 @@
   autoreconfHook,
   curl,
   fetchhg,
-  libXext,
-  libXft,
-  libXi,
-  libXinerama,
-  libXtst,
-  libXv,
-  libXxf86vm,
+  libxext,
+  libxft,
+  libxi,
+  libxinerama,
+  libxtst,
+  libxv,
+  libxxf86vm,
   libjpeg,
   libpng,
   lirc,
@@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     curl
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXtst
-    libXv
-    libXxf86vm
+    libxext
+    libxft
+    libxi
+    libxinerama
+    libxtst
+    libxv
+    libxxf86vm
     libjpeg
     libpng
     lirc
diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix
index 5648c4366718..828ed719f2ad 100644
--- a/pkgs/by-name/xj/xjadeo/package.nix
+++ b/pkgs/by-name/xj/xjadeo/package.nix
@@ -8,8 +8,8 @@
   libGLU,
   libjack2,
   liblo,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   pkg-config,
   portmidi,
   libxpm,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ffmpeg
     libjack2
-    libX11
+    libx11
     libxext
     libxpm
     # The following are recommended in the README, but are seemingly
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libGLU
     liblo
-    libXv
+    libxv
     portmidi
   ];
 
diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index 13427370089e..8c9c30807523 100644
--- a/pkgs/by-name/xk/xkb-switch-i3/package.nix
+++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix
@@ -6,7 +6,7 @@
   i3,
   jsoncpp,
   libsigcxx,
-  libX11,
+  libx11,
   libxkbfile,
   pkg-config,
   fetchpatch,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     i3
     jsoncpp
     libsigcxx
-    libX11
+    libx11
     libxkbfile
   ];
 
diff --git a/pkgs/by-name/xk/xkb-switch/package.nix b/pkgs/by-name/xk/xkb-switch/package.nix
index 969344600454..88cedbc0cb5d 100644
--- a/pkgs/by-name/xk/xkb-switch/package.nix
+++ b/pkgs/by-name/xk/xkb-switch/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   libxkbfile,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libX11
+    libx11
     libxkbfile
   ];
 
diff --git a/pkgs/by-name/xk/xkbd/package.nix b/pkgs/by-name/xk/xkbd/package.nix
index 5941c24070ba..d30c265223d2 100644
--- a/pkgs/by-name/xk/xkbd/package.nix
+++ b/pkgs/by-name/xk/xkbd/package.nix
@@ -3,15 +3,15 @@
   stdenv,
   fetchFromGitHub,
   freetype,
-  libXrender,
-  libXft,
+  libxrender,
+  libxft,
   xorgproto,
   xinput,
-  libXi,
-  libXext,
-  libXtst,
-  libXpm,
-  libX11,
+  libxi,
+  libxext,
+  libxtst,
+  libxpm,
+  libx11,
   autoreconfHook,
 }:
 
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     freetype
-    libXrender
-    libXft
-    libXext
-    libXtst
-    libXpm
-    libX11
-    libXi
+    libxrender
+    libxft
+    libxext
+    libxtst
+    libxpm
+    libx11
+    libxi
     xorgproto
     xinput
   ];
diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
index 06e48c2c2a2e..c6274c52ae6b 100644
--- a/pkgs/by-name/xk/xkblayout-state/package.nix
+++ b/pkgs/by-name/xk/xkblayout-state/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix
index 9ac85eeacb4b..112455193fe2 100644
--- a/pkgs/by-name/xk/xkbmon/package.nix
+++ b/pkgs/by-name/xk/xkbmon/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxcb,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
   ];
 
diff --git a/pkgs/by-name/xk/xkbset/package.nix b/pkgs/by-name/xk/xkbset/package.nix
index 408a47af1858..06c12cf73d24 100644
--- a/pkgs/by-name/xk/xkbset/package.nix
+++ b/pkgs/by-name/xk/xkbset/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   perl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     perl
-    libX11
+    libx11
   ];
 
   makeFlags = [ "X11PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index 9f8b08240c65..cdd416124159 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
-  libXrandr,
+  libx11,
+  libxi,
+  libxrandr,
   txt2man,
 }:
 
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXi
-    libXrandr
+    libx11
+    libxi
+    libxrandr
   ];
 
   installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/xl/xloadimage/package.nix b/pkgs/by-name/xl/xloadimage/package.nix
index f80017007a1c..945275de5126 100644
--- a/pkgs/by-name/xl/xloadimage/package.nix
+++ b/pkgs/by-name/xl/xloadimage/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   fetchzip,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   autoreconfHook,
   quilt,
 
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ]
   ++ lib.optionals withJpegSupport [
     libjpeg
diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 6a18a63b3ba9..7355d6253f33 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -3,11 +3,11 @@
   lib,
   fetchurl,
   pam ? null,
-  libX11,
-  libXext,
-  libXinerama,
-  libXdmcp,
-  libXt,
+  libx11,
+  libxext,
+  libxinerama,
+  libxdmcp,
+  libxt,
   autoreconfHook,
 }:
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
   # Optionally, it can use GTK.
   buildInputs = [
     pam
-    libX11
-    libXext.dev
-    libXinerama
-    libXdmcp
-    libXt
+    libx11
+    libxext.dev
+    libxinerama
+    libxdmcp
+    libxt
   ];
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/by-name/xm/xmacro/package.nix b/pkgs/by-name/xm/xmacro/package.nix
index d8ad84180708..edd56237b680 100644
--- a/pkgs/by-name/xm/xmacro/package.nix
+++ b/pkgs/by-name/xm/xmacro/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/xm/xmagnify/package.nix b/pkgs/by-name/xm/xmagnify/package.nix
index edeae3fbaec5..91cec22ef2a6 100644
--- a/pkgs/by-name/xm/xmagnify/package.nix
+++ b/pkgs/by-name/xm/xmagnify/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   prePatch = "substituteInPlace ./Makefile --replace /usr $out";
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xm/xmcp/package.nix b/pkgs/by-name/xm/xmcp/package.nix
index 86cd5b8fa10a..0a62705e6f91 100644
--- a/pkgs/by-name/xm/xmcp/package.nix
+++ b/pkgs/by-name/xm/xmcp/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-B3YkYrVEg6UJ2ApaVook4N2XvrCboxDMUG5CN9I79Sg=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix
index 301742c35acb..6763e8bc0dc3 100644
--- a/pkgs/by-name/xm/xmenu/package.nix
+++ b/pkgs/by-name/xm/xmenu/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   imlib2,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index c2e3f03afd51..377bed913c78 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -7,7 +7,7 @@
   harfbuzz,
   libpng,
   libxcb-util,
-  libXcursor,
+  libxcursor,
   libxcb-image,
   libxkbcommon,
   libxcb-cursor,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     harfbuzz
-    libXcursor
+    libxcursor
     libpng
     libxkbcommon
     libxcb-cursor
diff --git a/pkgs/by-name/xm/xmountains/package.nix b/pkgs/by-name/xm/xmountains/package.nix
index d005dbbba6dd..eb78769b7b99 100644
--- a/pkgs/by-name/xm/xmountains/package.nix
+++ b/pkgs/by-name/xm/xmountains/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   xbitmaps,
-  libX11,
+  libx11,
   imake,
   gccmakedep,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xbitmaps
-    libX11
+    libx11
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xn/xnee/package.nix b/pkgs/by-name/xn/xnee/package.nix
index fbd35d936fb1..09ced2d262a8 100644
--- a/pkgs/by-name/xn/xnee/package.nix
+++ b/pkgs/by-name/xn/xnee/package.nix
@@ -7,10 +7,10 @@
   autoreconfHook,
   pkg-config,
   gtk2,
-  libX11,
-  libXext,
-  libXi,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxtst,
   texinfo,
   xorgproto,
 }:
@@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk2
-    libX11
-    libXext
-    libXi
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxtst
     texinfo
     xorgproto
   ];
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
-    # lacks libXi.
+    # lacks libxi.
     "LDFLAGS=-lXi"
   ];
 
diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix
index f2a8d1a52a09..8fb402124502 100644
--- a/pkgs/by-name/xn/xnotify/package.nix
+++ b/pkgs/by-name/xn/xnotify/package.nix
@@ -5,9 +5,9 @@
   writeText,
   fontconfig,
   imlib2,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
   conf ? null,
 }:
 
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     imlib2
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   postPatch =
diff --git a/pkgs/by-name/xo/xorgproto/package.nix b/pkgs/by-name/xo/xorgproto/package.nix
index f75e6d51e44c..bd44d61263cc 100644
--- a/pkgs/by-name/xo/xorgproto/package.nix
+++ b/pkgs/by-name/xo/xorgproto/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  # adds support for printproto needed for libXp
+  # adds support for printproto needed for libxp
   mesonFlags = [ "-Dlegacy=true" ];
 
   passthru = {
diff --git a/pkgs/by-name/xo/xosd/package.nix b/pkgs/by-name/xo/xosd/package.nix
index c4680c348743..a1fb8c8e533e 100644
--- a/pkgs/by-name/xo/xosd/package.nix
+++ b/pkgs/by-name/xo/xosd/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   xorgproto,
 }:
 
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXt
+    libx11
+    libxext
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix
index 7a5c28185257..a9fd41cf281d 100644
--- a/pkgs/by-name/xo/xosview/package.nix
+++ b/pkgs/by-name/xo/xosview/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
   dontConfigure = true;
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xo/xosview2/package.nix b/pkgs/by-name/xo/xosview2/package.nix
index cac74ba42dce..3fba23da1fb1 100644
--- a/pkgs/by-name/xo/xosview2/package.nix
+++ b/pkgs/by-name/xo/xosview2/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     homepage = "https://xosview.sourceforge.net/index.html";
@@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "xosview2";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
index db63315fd4a1..bb745306080a 100644
--- a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
+++ b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
@@ -4,8 +4,8 @@
   fetchzip,
   autoPatchelfHook,
   libusb1,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   qt5,
   libglvnd,
 }:
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libusb1
-    libX11
-    libXtst
+    libx11
+    libxtst
     qt5.qtbase
     libglvnd
     (lib.getLib stdenv.cc.cc)
diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
index 54d5facb3971..1b5513763f13 100644
--- a/pkgs/by-name/xp/xpilot-ng/package.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libsm,
-  libXext,
+  libxext,
   SDL,
   libGLU,
   libGL,
@@ -12,7 +12,7 @@
   SDL_ttf,
   SDL_image,
   zlib,
-  libXxf86misc,
+  libxxf86misc,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpilot-ng";
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8ocJPHV6cSMgAPIQ7kpO3szJ6K8IF9W+QwhOhK69Rwk=";
   };
   buildInputs = [
-    libX11
+    libx11
     libsm
-    libXext
+    libxext
     SDL
     SDL_ttf
     SDL_image
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     expat
     zlib
-    libXxf86misc
+    libxxf86misc
   ];
 
   patches = [
diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 18b735c28bd5..4e07eec84197 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -11,17 +11,17 @@
   freetype,
   alsa-lib,
   makeShellWrapper,
-  libX11,
-  libXext,
-  libXdamage,
-  libXfixes,
+  libx11,
+  libxext,
+  libxdamage,
+  libxfixes,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXi,
-  libXrender,
-  libXtst,
-  libXxf86vm,
+  libxcomposite,
+  libxcursor,
+  libxi,
+  libxrender,
+  libxtst,
+  libxxf86vm,
   util-linux,
   socat,
 }:
@@ -70,18 +70,18 @@ stdenvNoCC.mkDerivation rec {
     freetype
     gtk3
     alsa-lib
-    libX11
-    libX11
-    libXext
-    libXdamage
-    libXfixes
+    libx11
+    libx11
+    libxext
+    libxdamage
+    libxfixes
     libxcb
-    libXcomposite
-    libXcursor
-    libXi
-    libXrender
-    libXtst
-    libXxf86vm
+    libxcomposite
+    libxcursor
+    libxi
+    libxrender
+    libxtst
+    libxxf86vm
     util-linux
     socat
   ];
diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix
index 6efcbf35803d..7266a42651b1 100644
--- a/pkgs/by-name/xp/xpointerbarrier/package.nix
+++ b/pkgs/by-name/xp/xpointerbarrier/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxfixes,
+  libxrandr,
   gitUpdater,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXfixes
-    libXrandr
+    libx11
+    libxfixes
+    libxrandr
   ];
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/xp/xprintidle-ng/package.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix
index 28644d574a7e..188bf4549515 100644
--- a/pkgs/by-name/xp/xprintidle-ng/package.nix
+++ b/pkgs/by-name/xp/xprintidle-ng/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXScrnSaver,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxext,
   gnulib,
   autoconf,
   automake,
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    libX11
-    libXScrnSaver
-    libXext
+    libx11
+    libxscrnsaver
+    libxext
   ];
 
   meta = {
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index e36ee63af878..d000e8af03d1 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
   conf ? null,
   nix-update-script,
 }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/xr/xrandr-invert-colors/package.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
index 8cbf313d8540..ec2d7afad27b 100644
--- a/pkgs/by-name/xr/xrandr-invert-colors/package.nix
+++ b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libXrandr,
+  libxrandr,
   libxcb,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libXrandr
+    libxrandr
     libxcb
   ];
 
diff --git a/pkgs/by-name/xr/xrectsel/package.nix b/pkgs/by-name/xr/xrectsel/package.nix
index d02d0a086dd8..4bca0b0cc71e 100644
--- a/pkgs/by-name/xr/xrectsel/package.nix
+++ b/pkgs/by-name/xr/xrectsel/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Print the geometry of a rectangular screen region";
diff --git a/pkgs/by-name/xr/xrq/package.nix b/pkgs/by-name/xr/xrq/package.nix
index bfa8fd55832c..89b2eceb94cd 100644
--- a/pkgs/by-name/xr/xrq/package.nix
+++ b/pkgs/by-name/xr/xrq/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     "man"
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "X utility for querying xrdb";
diff --git a/pkgs/by-name/xs/xsane/package.nix b/pkgs/by-name/xs/xsane/package.nix
index 26a580f0d76b..a34e6e3ad49e 100644
--- a/pkgs/by-name/xs/xsane/package.nix
+++ b/pkgs/by-name/xs/xsane/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   sane-backends,
   sane-frontends,
-  libX11,
+  libx11,
   gtk2,
   pkg-config,
   libpng,
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
     libusb-compat-0_1
     sane-backends
     sane-frontends
-    libX11
+    libx11
     gtk2
   ]
   ++ lib.optional gimpSupport gimp;
diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix
index b0b569705770..e524c83017ca 100644
--- a/pkgs/by-name/xs/xschem/package.nix
+++ b/pkgs/by-name/xs/xschem/package.nix
@@ -5,8 +5,8 @@
   bison,
   cairo,
   flex,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   pkg-config,
   tcl,
   tk,
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    libX11
-    libXpm
+    libx11
+    libxpm
     tcl
     tk
   ];
diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix
index 048941672826..013ba64959b0 100644
--- a/pkgs/by-name/xs/xscreensaver/package.nix
+++ b/pkgs/by-name/xs/xscreensaver/package.nix
@@ -11,14 +11,14 @@
   intltool,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXft,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXt,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxft,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxt,
+  libxxf86vm,
   libxml2,
   makeWrapper,
   pam,
@@ -61,14 +61,14 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libGL
     libGLU
-    libX11
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXrandr
-    libXt
-    libXxf86vm
+    libx11
+    libxext
+    libxft
+    libxi
+    libxinerama
+    libxrandr
+    libxt
+    libxxf86vm
     libxml2
     pam
     perlPackages.LWPProtocolHttps
diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix
index 3a18c062e3ca..25c4705fa810 100644
--- a/pkgs/by-name/xs/xsct/package.nix
+++ b/pkgs/by-name/xs/xsct/package.nix
@@ -3,8 +3,8 @@
   lib,
   fetchFromGitHub,
   gitUpdater,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xs/xsecurelock/package.nix b/pkgs/by-name/xs/xsecurelock/package.nix
index 7a7c205d45f9..6b5953562769 100644
--- a/pkgs/by-name/xs/xsecurelock/package.nix
+++ b/pkgs/by-name/xs/xsecurelock/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libX11,
-  libXcomposite,
-  libXft,
-  libXmu,
-  libXrandr,
-  libXext,
-  libXScrnSaver,
+  libx11,
+  libxcomposite,
+  libxft,
+  libxmu,
+  libxrandr,
+  libxext,
+  libxscrnsaver,
   pam,
   apacheHttpd,
   pamtester,
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcomposite
-    libXft
-    libXmu
-    libXrandr
-    libXext
-    libXScrnSaver
+    libx11
+    libxcomposite
+    libxft
+    libxmu
+    libxrandr
+    libxext
+    libxscrnsaver
     pam
     apacheHttpd
     pamtester
diff --git a/pkgs/by-name/xs/xsel/package.nix b/pkgs/by-name/xs/xsel/package.nix
index a9f4b1604c34..894aad3ebd78 100644
--- a/pkgs/by-name/xs/xsel/package.nix
+++ b/pkgs/by-name/xs/xsel/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   autoreconfHook,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   meta = {
diff --git a/pkgs/by-name/xs/xsettingsd/package.nix b/pkgs/by-name/xs/xsettingsd/package.nix
index 88564193e0cb..39129bad25f6 100644
--- a/pkgs/by-name/xs/xsettingsd/package.nix
+++ b/pkgs/by-name/xs/xsettingsd/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # we end up with symlinked unit files if we don't move them around ourselves
   postFixup = ''
diff --git a/pkgs/by-name/xs/xskat/package.nix b/pkgs/by-name/xs/xskat/package.nix
index 6e8115c3a04a..4aadc81e238e 100644
--- a/pkgs/by-name/xs/xskat/package.nix
+++ b/pkgs/by-name/xs/xskat/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   imake,
   gccmakedep,
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ gccmakedep ];
   buildInputs = [
-    libX11
+    libx11
     imake
   ];
 
diff --git a/pkgs/by-name/xs/xsok/package.nix b/pkgs/by-name/xs/xsok/package.nix
index 90f312db0990..eb180a87dd68 100644
--- a/pkgs/by-name/xs/xsok/package.nix
+++ b/pkgs/by-name/xs/xsok/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   imake,
-  libXt,
-  libXaw,
-  libXpm,
-  libXext,
+  libxt,
+  libxaw,
+  libxpm,
+  libxext,
   withNethackLevels ? true,
 }:
 stdenv.mkDerivation rec {
@@ -25,15 +25,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXt
-    libXaw
-    libXpm
-    libXext
+    libx11
+    libxt
+    libxaw
+    libxpm
+    libxext
   ];
   nativeBuildInputs = [ imake ];
 
-  env.NIX_CFLAGS_COMPILE = " -isystem ${libXpm.dev}/include/X11 ";
+  env.NIX_CFLAGS_COMPILE = " -isystem ${libxpm.dev}/include/X11 ";
 
   preConfigure = ''
     sed -e "s@/usr/@$out/share/@g" -i src/Imakefile
diff --git a/pkgs/by-name/xs/xsokoban/package.nix b/pkgs/by-name/xs/xsokoban/package.nix
index 29d71878fde6..3bc9fad64975 100644
--- a/pkgs/by-name/xs/xsokoban/package.nix
+++ b/pkgs/by-name/xs/xsokoban/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   xorgproto,
-  libXpm,
-  libXt,
+  libxpm,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXpm
-    libXt
+    libxpm
+    libxt
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration";
+  env.NIX_CFLAGS_COMPILE = "-I${libxpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration";
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix
index 24602a98cb13..d7bc6bb63951 100644
--- a/pkgs/by-name/xs/xss-lock/package.nix
+++ b/pkgs/by-name/xs/xss-lock/package.nix
@@ -7,8 +7,8 @@
   pkg-config,
   glib,
   libpthread-stubs,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   libxcb-util,
   nixosTests,
 }:
@@ -38,8 +38,8 @@ stdenv.mkDerivation {
   buildInputs = [
     glib
     libpthread-stubs
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     libxcb-util
   ];
 
diff --git a/pkgs/by-name/xs/xssstate/package.nix b/pkgs/by-name/xs/xssstate/package.nix
index 779e1786ee6b..8572a6ecccf0 100644
--- a/pkgs/by-name/xs/xssstate/package.nix
+++ b/pkgs/by-name/xs/xssstate/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xssstate";
@@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXScrnSaver
+    libx11
+    libxscrnsaver
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix
index 826df612b4be..e63aefa4391f 100644
--- a/pkgs/by-name/xs/xst/package.nix
+++ b/pkgs/by-name/xs/xst/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fontconfig,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
   nix-update-script,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     fontconfig
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/xt/xtrace/package.nix b/pkgs/by-name/xt/xtrace/package.nix
index 51af4adeead9..9ed1225b2a7d 100644
--- a/pkgs/by-name/xt/xtrace/package.nix
+++ b/pkgs/by-name/xt/xtrace/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   autoreconfHook,
   fetchFromGitLab,
-  libX11,
+  libx11,
   xauth,
   makeWrapper,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     makeWrapper
   ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postInstall = ''
     wrapProgram "$out/bin/xtrace" \
diff --git a/pkgs/by-name/xt/xtuner/package.nix b/pkgs/by-name/xt/xtuner/package.nix
index 0e3770b7285d..ed94f34e9a20 100644
--- a/pkgs/by-name/xt/xtuner/package.nix
+++ b/pkgs/by-name/xt/xtuner/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   libjack2,
   liblo,
   libsigcxx,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     libjack2
     liblo
     libsigcxx
diff --git a/pkgs/by-name/xu/xunlei-uos/package.nix b/pkgs/by-name/xu/xunlei-uos/package.nix
index 02cc121439c3..d7b010ca453d 100644
--- a/pkgs/by-name/xu/xunlei-uos/package.nix
+++ b/pkgs/by-name/xu/xunlei-uos/package.nix
@@ -11,9 +11,9 @@
   gtk2,
   alsa-lib,
   dbus-glib,
-  libXtst,
-  libXdamage,
-  libXScrnSaver,
+  libxtst,
+  libxdamage,
+  libxscrnsaver,
 }:
 
 let
@@ -46,9 +46,9 @@ let
       gtk2
       alsa-lib
       dbus-glib
-      libXtst
-      libXdamage
-      libXScrnSaver
+      libxtst
+      libxdamage
+      libxscrnsaver
     ];
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index afa62f072a22..df80cfbc9126 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -8,8 +8,8 @@
   dri-pkgconfig-stub,
   libdrm,
   libGL,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
   libxcvt,
   libxdmcp,
@@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     dri-pkgconfig-stub
     libdrm
     libGL
-    libX11
-    libXau
+    libx11
+    libxau
     libxcb
     libxcvt
     libxdmcp
diff --git a/pkgs/by-name/xv/xvkbd/package.nix b/pkgs/by-name/xv/xvkbd/package.nix
index 84c65b6f53e1..9dbea754baa8 100644
--- a/pkgs/by-name/xv/xvkbd/package.nix
+++ b/pkgs/by-name/xv/xvkbd/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  libXt,
-  libXaw,
-  libXtst,
-  libXi,
-  libXpm,
+  libxt,
+  libxaw,
+  libxtst,
+  libxi,
+  libxpm,
   pkg-config,
   xorgproto,
   Xaw3d,
@@ -22,17 +22,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXt
-    libXaw
-    libXtst
+    libxt
+    libxaw
+    libxtst
     xorgproto
-    libXi
+    libxi
     Xaw3d
-    libXpm
+    libxpm
   ];
 
   makeFlags = [
-    # avoid default libXt location
+    # avoid default libxt location
     "appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
     "datarootdir=${placeholder "out"}/share"
   ];
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index d7906269f86e..dbd0f710e5a9 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -11,7 +11,7 @@
   libseccomp,
   libjpeg,
   libpng,
-  libXpm,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libseccomp
     libjpeg
     libpng
-    libXpm
+    libxpm
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix
index b44173580179..4946d87e0846 100644
--- a/pkgs/by-name/xw/xwayland/package.nix
+++ b/pkgs/by-name/xw/xwayland/package.nix
@@ -11,18 +11,18 @@
   libei,
   libGL,
   libGLU,
-  libX11,
-  libXau,
-  libXaw,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXfont2,
-  libXmu,
-  libXpm,
-  libXrender,
-  libXres,
-  libXt,
+  libx11,
+  libxau,
+  libxaw,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxfont_2,
+  libxmu,
+  libxpm,
+  libxrender,
+  libxres,
+  libxt,
   libdrm,
   libtirpc,
   # Disable withLibunwind as LLVM's libunwind will conflict and does not support the right symbols.
@@ -85,18 +85,18 @@ stdenv.mkDerivation rec {
     font-util
     libGL
     libGLU
-    libX11
-    libXau
-    libXaw
-    libXdmcp
-    libXext
-    libXfixes
-    libXfont2
-    libXmu
-    libXpm
-    libXrender
-    libXres
-    libXt
+    libx11
+    libxau
+    libxaw
+    libxdmcp
+    libxext
+    libxfixes
+    libxfont_2
+    libxmu
+    libxpm
+    libxrender
+    libxres
+    libxt
     libdrm
     libtirpc
     libxcb
diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
index c8e67dbd17e5..0a45662bb9df 100644
--- a/pkgs/by-name/xw/xwinmosaic/package.nix
+++ b/pkgs/by-name/xw/xwinmosaic/package.nix
@@ -6,7 +6,7 @@
   gtk2,
   cmake,
   pkg-config,
-  libXdamage,
+  libxdamage,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk2
-    libXdamage
+    libxdamage
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/xx/xxkb/package.nix b/pkgs/by-name/xx/xxkb/package.nix
index 4b5a00d9aba4..b631cefec49b 100644
--- a/pkgs/by-name/xx/xxkb/package.nix
+++ b/pkgs/by-name/xx/xxkb/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
-  libXext,
-  libXpm,
+  libx11,
+  libxt,
+  libxext,
+  libxpm,
   imake,
   gccmakedep,
   svgSupport ? false,
@@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXt
-    libXext
-    libXpm
+    libx11
+    libxt
+    libxext
+    libxpm
   ]
   ++ lib.optionals svgSupport [
     librsvg
diff --git a/pkgs/by-name/xz/xzoom/package.nix b/pkgs/by-name/xz/xzoom/package.nix
index 1eca0f3e668d..3e722d3f7603 100644
--- a/pkgs/by-name/xz/xzoom/package.nix
+++ b/pkgs/by-name/xz/xzoom/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   imake,
   gccmakedep,
 }:
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXt
+    libx11
+    libxext
+    libxt
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix
index 3213e98bc5fc..5be60c165135 100644
--- a/pkgs/by-name/ya/yabasic/package.nix
+++ b/pkgs/by-name/ya/yabasic/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   libsm,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   libffi,
   ncurses,
 }:
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libsm
-    libX11
-    libXt
+    libx11
+    libxt
     libffi
     ncurses
   ];
diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix
index e626afdcac28..97349be2aac9 100644
--- a/pkgs/by-name/ya/yarg/package.nix
+++ b/pkgs/by-name/ya/yarg/package.nix
@@ -9,14 +9,14 @@
   dbus,
   hidapi,
   libGL,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   udev,
   vulkan-loader,
   wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
@@ -47,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     hidapi
     libGL
-    libXcursor
-    libXext
-    libXi
-    libXinerama
+    libxcursor
+    libxext
+    libxi
+    libxinerama
     libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     udev
     vulkan-loader
     wayland
diff --git a/pkgs/by-name/ya/yazi/plugins/drag/default.nix b/pkgs/by-name/ya/yazi/plugins/drag/default.nix
new file mode 100644
index 000000000000..372dbdc125b2
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/drag/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "drag.yazi";
+  version = "0-unstable-2025-08-29";
+
+  src = fetchFromGitHub {
+    owner = "Joao-Queiroga";
+    repo = "drag.yazi";
+    rev = "27606689cb82c56a19c052a7b7935cd9b1466bab";
+    hash = "sha256-ITkZjpwWXni4tQpDhUiVvtPrEkAo6RISgCH594NgpYE=";
+  };
+
+  meta = {
+    description = "Yazi plugin to drag and drop files using ripdrag";
+    homepage = "https://github.com/Joao-Queiroga/drag.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gibbert ];
+  };
+}
diff --git a/pkgs/by-name/ye/yeahconsole/package.nix b/pkgs/by-name/ye/yeahconsole/package.nix
index 31fb1d9da27f..d981eed07874 100644
--- a/pkgs/by-name/ye/yeahconsole/package.nix
+++ b/pkgs/by-name/ye/yeahconsole/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index 74244f62f152..ce576317e30f 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -11,7 +11,7 @@
   libGLU,
   libjack2,
   libsndfile,
-  libXdmcp,
+  libxdmcp,
   lv2,
   minixml,
   pcre,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libjack2
     libsndfile
-    libXdmcp
+    libxdmcp
     lv2
     minixml
     pcre
diff --git a/pkgs/by-name/ys/ysfx/package.nix b/pkgs/by-name/ys/ysfx/package.nix
index 1762440ad6c0..1b220e0eac10 100644
--- a/pkgs/by-name/ys/ysfx/package.nix
+++ b/pkgs/by-name/ys/ysfx/package.nix
@@ -6,11 +6,11 @@
   pkg-config,
   freetype,
   juce,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libglvnd,
 }:
 
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freetype
     juce
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libglvnd
   ];
 
diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index ef3bc26a2874..9427e2386a52 100644
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   boost,
-  libX11,
+  libx11,
   libGL,
   liblo,
   libjack2,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost
-    libX11
+    libx11
     libGL
     liblo
     libjack2
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index 58c0f78ef04c..5a751dced519 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   httplib,
   libarchive,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libxcb-keysyms,
   qt6,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     httplib
-    libXdmcp
+    libxdmcp
     libarchive
     libpthread-stubs
     qt6.qtbase
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index f0c58f28b65e..7a87a841a22e 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,8 +35,8 @@
   makeBinaryWrapper,
   nodejs,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   livekit-libwebrtc,
   testers,
   writableTmpDirAsHomeHook,
@@ -173,8 +173,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxcb
     # required by livekit:
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
index c673eec68bf8..6e4a62bbbb37 100644
--- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
@@ -24,8 +24,8 @@
   libGLU,
   libGL,
   xorgproto,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   nspr,
   SDL2,
   gloox,
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     xorgproto
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     nspr
     SDL2
     gloox
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${xorgproto}/include"
-    "-I${libX11.dev}/include"
-    "-I${libXcursor.dev}/include"
+    "-I${libx11.dev}/include"
+    "-I${libxcursor.dev}/include"
     "-I${SDL2}/include/SDL2"
     "-I${fmt_9.dev}/include"
     "-I${nvidia-texture-tools.dev}/include"
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
index 8f0e273ee0e9..26d3f11b30f0 100644
--- a/pkgs/by-name/ze/zesarux/package.nix
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -5,8 +5,8 @@
   SDL2,
   aalib,
   alsa-lib,
-  libXext,
-  libXxf86vm,
+  libxext,
+  libxxf86vm,
   libcaca,
   libpulseaudio,
   libsndfile,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     aalib
     alsa-lib
-    libXxf86vm
-    libXext
+    libxxf86vm
+    libxext
     libcaca
     libpulseaudio
     libsndfile
diff --git a/pkgs/by-name/zi/zita-at1/package.nix b/pkgs/by-name/zi/zita-at1/package.nix
index a1fe6fdd6f6e..2a3b3073e490 100644
--- a/pkgs/by-name/zi/zita-at1/package.nix
+++ b/pkgs/by-name/zi/zita-at1/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   cairo,
   fftwSinglePrec,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   libclthreads,
   libclxclient,
   libjack2,
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     fftwSinglePrec
-    libX11
-    libXft
+    libx11
+    libxft
     libclthreads
     libclxclient
     libjack2
diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix
index 2ed0c224ed06..2d9852abe9d7 100644
--- a/pkgs/by-name/zl/zlcompressor/package.nix
+++ b/pkgs/by-name/zl/zlcompressor/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix
index fd7ef5e529f1..91318d2abaa7 100644
--- a/pkgs/by-name/zl/zlequalizer/package.nix
+++ b/pkgs/by-name/zl/zlequalizer/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix
index 64fa5d3e0aa0..fd2f7e4aa15f 100644
--- a/pkgs/by-name/zl/zlsplitter/package.nix
+++ b/pkgs/by-name/zl/zlsplitter/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix
index 4c493483df57..06f975b68420 100644
--- a/pkgs/by-name/zu/zutty/package.nix
+++ b/pkgs/by-name/zu/zutty/package.nix
@@ -6,7 +6,7 @@
   freetype,
   wafHook,
   python3,
-  libXmu,
+  libxmu,
   glew,
   ucs-fonts,
   nixosTests,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     freetype
-    libXmu
+    libxmu
     glew
   ];
 
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index e2bb3289d9d6..86b2590685de 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -22,9 +22,9 @@
   kiconthemes,
   libpthread-stubs,
   pcre,
-  libXdmcp,
-  libX11,
-  libXau, # X11 dependencies
+  libxdmcp,
+  libx11,
+  libxau, # X11 dependencies
   fetchpatch,
 }:
 
@@ -78,9 +78,9 @@ mkDerivation rec {
     frameworkintegration
     libpthread-stubs
     pcre
-    libXdmcp
-    libX11
-    libXau
+    libxdmcp
+    libx11
+    libxau
   ]
   ++ lib.optional gtk2Support gtk2;
 
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 19e005ac9e1d..f0c2c46d9c87 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libXdmcp,
+  libxdmcp,
   libexif,
   libfm,
   libpthread-stubs,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libexif
     libfm
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 830f8e5bc01e..662769fc4801 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -5,7 +5,7 @@
   cmake,
   gitUpdater,
   kwindowsystem,
-  libXScrnSaver,
+  libxscrnsaver,
   libqtxdg,
   lxqt-build-tools,
   polkit-qt-1,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     kwindowsystem
-    libXScrnSaver
+    libxscrnsaver
     libqtxdg
     polkit-qt-1
     qtsvg
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index b6d0eb7cfe1e..72030d8d5df8 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libXdmcp,
+  libxdmcp,
   libexif,
   libfm-qt,
   libpthread-stubs,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libexif
     libfm-qt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 81477a03a7c5..f78d5f043c90 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -5,9 +5,9 @@
   cmake,
   glib,
   kwindowsystem,
-  libXScrnSaver,
-  libXcursor,
-  libXdmcp,
+  libxscrnsaver,
+  libxcursor,
+  libxdmcp,
   libkscreen,
   liblxqt,
   libpthread-stubs,
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib.bin
     kwindowsystem
-    libXScrnSaver
-    libXcursor
-    libXdmcp
+    libxscrnsaver
+    libxcursor
+    libxdmcp
     libkscreen
     liblxqt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 77b627c97e3a..04a62049fd8d 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -9,9 +9,9 @@
   kguiaddons,
   kwindowsystem,
   layer-shell-qt,
-  libXdamage,
-  libXdmcp,
-  libXtst,
+  libxdamage,
+  libxdmcp,
+  libxtst,
   libdbusmenu,
   liblxqt,
   libpthread-stubs,
@@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     kguiaddons
     kwindowsystem
     layer-shell-qt
-    libXdamage
-    libXdmcp
-    libXtst
+    libxdamage
+    libxdmcp
+    libxtst
     libdbusmenu
     liblxqt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index e3f885ffcd1e..1026c8fbdb98 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -5,7 +5,7 @@
   cmake,
   kwindowsystem,
   layer-shell-qt,
-  libXdmcp,
+  libxdmcp,
   liblxqt,
   libpthread-stubs,
   libqtxdg,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     kwindowsystem
     layer-shell-qt
-    libXdmcp
+    libxdmcp
     liblxqt
     libpthread-stubs
     libqtxdg
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 8f77173f9c7a..31f2ef03909e 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libsm,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   lxqt-build-tools,
   openbox,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libsm
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     openbox
     pcre
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 1414ed9973e4..caa8717adc43 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -7,7 +7,7 @@
   gitUpdater,
   kwindowsystem,
   layer-shell-qt,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     kwindowsystem
     layer-shell-qt
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     libqtxdg
     qtbase
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 276f473c9af0..296c681f6282 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -11,9 +11,9 @@
   libxml2,
   libcanberra-gtk3,
   libgtop,
-  libXdamage,
-  libXpresent,
-  libXres,
+  libxdamage,
+  libxpresent,
+  libxres,
   libstartup_notification,
   zenity,
   glib,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libcanberra-gtk3
     libgtop
-    libXdamage
-    libXpresent
-    libXres
+    libxdamage
+    libxpresent
+    libxres
     libstartup_notification
     gtk3
     zenity
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 61e8b2a2b9a5..19d330f53c6c 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -7,7 +7,7 @@
   gtk3,
   libwnck,
   libfakekey,
-  libXtst,
+  libxtst,
   mate,
   wrapGAppsHook3,
   gitUpdater,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libwnck
     libfakekey
-    libXtst
+    libxtst
     mate.mate-panel
   ];
 
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 450bdef5132c..31e8cc3eb96d 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -6,7 +6,7 @@
   gettext,
   gtk3,
   dbus-glib,
-  libXScrnSaver,
+  libxscrnsaver,
   libnotify,
   libxml2,
   mate-desktop,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk3
     dbus-glib
-    libXScrnSaver
+    libxscrnsaver
     libnotify
     mate-desktop
     mate-menus
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 06eed5cb86e9..ce3705193afb 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -8,7 +8,7 @@
   dbus-glib,
   systemd,
   libsm,
-  libXtst,
+  libxtst,
   glib,
   gtk3,
   libepoxy,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-glib
     systemd
     libsm
-    libXtst
+    libxtst
     gtk3
     mate-desktop
     mate-screensaver # for gsm_manager_init
diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
index b768abcd1008..169b4e28fde8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
@@ -18,7 +18,7 @@
   libadwaita,
   libgee,
   libgtop,
-  libX11,
+  libx11,
   linuxPackages,
   live-chart,
   pciutils,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     libgee
     libgtop
-    libX11
+    libx11
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     live-chart
     pciutils
diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix
index 0f98fd12bef4..0b99d8209d29 100644
--- a/pkgs/development/compilers/fbc/default.nix
+++ b/pkgs/development/compilers/fbc/default.nix
@@ -6,10 +6,10 @@
   gpm,
   libffi,
   libGL,
-  libX11,
-  libXext,
-  libXpm,
-  libXrandr,
+  libx11,
+  libxext,
+  libxpm,
+  libxrandr,
   ncurses,
 }:
 
@@ -42,10 +42,10 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     gpm
     libGL
-    libX11
-    libXext
-    libXpm
-    libXrandr
+    libx11
+    libxext
+    libxpm
+    libxrandr
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 5a79e9f7b118..f9009186364f 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -35,7 +35,7 @@
   harfbuzz,
   libepoxy,
   pango,
-  libX11,
+  libx11,
   xorgproto,
   libdeflate,
   zlib,
@@ -93,7 +93,7 @@ let
     harfbuzz
     libepoxy
     pango
-    libX11
+    libx11
     libdeflate
   ];
 
@@ -120,7 +120,7 @@ let
   # They must be manually included.
   appStaticBuildDeps =
     (lib.optionals supportsLinuxDesktopTarget [
-      libX11
+      libx11
       xorgproto
       zlib
     ])
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 76507c48f3ef..884f0b4b82a0 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -10,10 +10,10 @@
   pango,
   atk,
   gdk-pixbuf,
-  libXi,
+  libxi,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   gdb,
   gnumake,
   binutils,
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
     fpc
     gtk2
     glib
-    libXi
+    libxi
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
     pango
     atk
     stdenv.cc
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index e2cfe84edac4..bc5d1cd61122 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -9,14 +9,14 @@
   zlib,
   which,
   texinfo,
-  libX11,
+  libx11,
   xorgproto,
-  libXi,
+  libxi,
   gmp,
-  libXext,
-  libXt,
-  libXaw,
-  libXmu,
+  libxext,
+  libxt,
+  libxaw,
+  libxmu,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
     binutils
     emacs
     gmp
-    libX11
+    libx11
     xorgproto
-    libXi
-    libXext
-    libXt
-    libXaw
-    libXmu
+    libxi
+    libxext
+    libxt
+    libxaw
+    libxmu
     zlib
     which
     texinfo
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 921929b5a54c..33f6231aafbd 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -11,14 +11,14 @@
   debugBuild ? false,
   withJcef ? true,
 
-  libXdamage,
-  libXxf86vm,
-  libXrandr,
-  libXi,
-  libXcursor,
-  libXrender,
-  libX11,
-  libXext,
+  libxdamage,
+  libxxf86vm,
+  libxrandr,
+  libxi,
+  libxcursor,
+  libxrender,
+  libx11,
+  libxext,
   libxkbcommon,
   libxcb,
   nss,
@@ -135,14 +135,14 @@ jdk.overrideAttrs (oldAttrs: rec {
     # Build the set of output library directories to rpath against
     LIBDIRS="${
       lib.makeLibraryPath [
-        libXdamage
-        libXxf86vm
-        libXrandr
-        libXi
-        libXcursor
-        libXrender
-        libX11
-        libXext
+        libxdamage
+        libxxf86vm
+        libxrandr
+        libxi
+        libxcursor
+        libxrender
+        libx11
+        libxext
         libxkbcommon
         libxcb
         nss
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 4dbf85637819..2bc5004691aa 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -20,8 +20,8 @@
   nss,
   nspr,
   libGL,
-  libX11,
-  libXdamage,
+  libx11,
+  libxdamage,
   boost,
   thrift,
   cef-binary,
@@ -112,8 +112,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost
     libGL
-    libX11
-    libXdamage
+    libx11
+    libxdamage
     nss
     nspr
     thrift20
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index dec07aee5742..379d6129c55d 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -7,7 +7,7 @@
   gettext,
   perl,
   libgdiplus,
-  libX11,
+  libx11,
   ncurses,
   zlib,
   bash,
@@ -48,15 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gettext
     libgdiplus
-    libX11
+    libx11
     ncurses
     zlib
     bash
   ];
 
   configureFlags = [
-    "--x-includes=${libX11.dev}/include"
-    "--x-libraries=${libX11.out}/lib"
+    "--x-includes=${libx11.dev}/include"
+    "--x-libraries=${libx11.out}/lib"
     "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
   ];
 
@@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace mcs/class/corlib/System/Environment.cs --replace-fail /usr/share "$out/share"
   '';
 
-  # Fix mono DLLMap so it can find libX11 to run winforms apps
+  # Fix mono DLLMap so it can find libx11 to run winforms apps
   # libgdiplus is correctly handled by the --with-libgdiplus configure flag
   # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
   # https://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | xargs \
-    sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g"
+    sed -i -e "s@libX11.so.6@${libx11.out}/lib/libX11.so.6@g"
   '';
 
   # Without this, any Mono application attempting to open an SSL connection will throw with
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index aba0450ab115..3110e7172a07 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   ncurses,
-  libX11,
+  libx11,
   xorgproto,
   buildEnv,
   useX11 ? stdenv.hostPlatform.isx86,
@@ -11,7 +11,7 @@
 
 let
   x11deps = [
-    libX11
+    libx11
     xorgproto
   ];
   inherit (lib) optionals;
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 1dd7b974f181..b2a1896622c1 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -23,7 +23,7 @@ in
   buildEnv,
   libunwind,
   fetchpatch,
-  libX11,
+  libx11,
   xorgproto,
   useX11 ? safeX11 stdenv && lib.versionOlder version "4.09",
   aflSupport ? false,
@@ -73,7 +73,7 @@ let
   x11env = buildEnv {
     name = "x11env";
     paths = [
-      libX11
+      libx11
       xorgproto
     ];
   };
@@ -171,7 +171,7 @@ stdenv.mkDerivation (
     buildInputs =
       optional (lib.versionOlder version "4.07") ncurses
       ++ optionals useX11 [
-        libX11
+        libx11
         xorgproto
       ];
     depsBuildBuild = lib.optionals (!stdenv.hostPlatform.isDarwin) [ binutils ];
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 0282b52d3c0f..a193c6360f58 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -29,16 +29,16 @@
   giflib,
   libpng,
   lcms2,
-  libX11,
+  libx11,
   libice,
-  libXext,
-  libXrender,
-  libXtst,
-  libXt,
-  libXi,
-  libXinerama,
-  libXcursor,
-  libXrandr,
+  libxext,
+  libxrender,
+  libxtst,
+  libxt,
+  libxi,
+  libxinerama,
+  libxcursor,
+  libxrandr,
   fontconfig,
 
   setJavaClassPath,
@@ -276,16 +276,16 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libjpeg
     giflib
-    libX11
+    libx11
     libice
-    libXext
-    libXrender
-    libXtst
-    libXt
-    libXi
-    libXinerama
-    libXcursor
-    libXrandr
+    libxext
+    libxrender
+    libxtst
+    libxt
+    libxi
+    libxinerama
+    libxcursor
+    libxrandr
     fontconfig
   ]
   ++ lib.optionals (atLeast11 && !atLeast21) [
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 1a09cdef7895..31282db8d289 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -19,11 +19,11 @@
   readline,
   libffi,
   libffcall,
-  libX11,
-  libXau,
-  libXt,
-  libXpm,
-  libXext,
+  libx11,
+  libxau,
+  libxt,
+  libxpm,
+  libxext,
   xorgproto,
   coreutils,
   # build options
@@ -45,12 +45,12 @@
 assert
   x11Support
   -> (
-    libX11 != null
-    && libXau != null
-    && libXt != null
-    && libXpm != null
+    libx11 != null
+    && libxau != null
+    && libxt != null
+    && libxpm != null
     && xorgproto != null
-    && libXext != null
+    && libxext != null
   );
 
 let
@@ -86,12 +86,12 @@ stdenv.mkDerivation {
   ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
   ++ lib.optional ffcallAvailable libffcall
   ++ lib.optionals x11Support [
-    libX11
-    libXau
-    libXt
-    libXpm
+    libx11
+    libxau
+    libxt
+    libxpm
     xorgproto
-    libXext
+    libxext
   ];
 
   # First, replace port 9090 (rather low, can be used)
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 328ecd9dfe02..ce3d127517ae 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
     netcdf-custom
     plplot-with-drivers
   ]
-  ++ lib.optional enableXWin plplot-with-drivers.libX11
+  ++ lib.optional enableXWin plplot-with-drivers.libx11
   ++ lib.optional enableGRIB eccodes
   ++ lib.optional enableGLPK glpk
   ++ lib.optional enableWX wxGTK32
@@ -190,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional enableSzip "-DSZIPDIR=${szip}"
     ++ lib.optionals enableXWin [
       "-DX11=ON"
-      "-DX11DIR=${plplot-with-drivers.libX11}"
+      "-DX11DIR=${plplot-with-drivers.libx11}"
     ]
     ++ lib.optionals enableMPI [
       "-DMPI=ON"
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index a1add4055af5..1dfa19956730 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -12,7 +12,7 @@
   qhull,
   libsndfile,
   portaudio,
-  libX11,
+  libx11,
   graphicsmagick,
   pcre2,
   pkg-config,
@@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL
     libGLU
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 5f735c1dc4ea..9f3d064ceeb1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -15,7 +15,7 @@
   tcl ? null,
   tk ? null,
   tclPackages,
-  libX11 ? null,
+  libx11 ? null,
   x11Support ? false,
   zlib,
   self,
@@ -46,7 +46,7 @@
   pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}",
 }:
 
-assert x11Support -> tcl != null && tk != null && libX11 != null;
+assert x11Support -> tcl != null && tk != null && libx11 != null;
 
 assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
   "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
@@ -279,7 +279,7 @@ let
     ++ lib.optionals x11Support [
       tcl
       tk
-      libX11
+      libx11
     ];
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index bfe766fc2917..41240a3decc3 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -18,7 +18,7 @@
   tcl,
   tk,
   tclPackages,
-  libX11,
+  libx11,
   gdbm,
   db,
   xz,
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     sqlite
     tk
     tcl
-    libX11
+    libx11
     gdbm
     db
   ]
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a72d4f4c4c80..d963a31ea02f 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -13,7 +13,7 @@
   curl,
   gcc,
   libsForQt5,
-  libXt,
+  libxt,
   qtbase,
   qttools,
   qtwebengine,
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     libsndfile
     fftw
     curl
-    libXt
+    libxt
     qtbase
     qtwebsockets
     qtwayland
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 33109f4656af..fa50aef21339 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -19,17 +19,17 @@
   libtheora,
   libvorbis,
   libwebp,
-  libX11,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXi,
-  libXpm,
-  libXt,
-  libXxf86dga,
-  libXxf86misc,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxi,
+  libxpm,
+  libxt,
+  libxxf86dga,
+  libxxf86misc,
+  libxxf86vm,
   openal,
   physfs,
   pkg-config,
@@ -92,17 +92,17 @@ stdenv.mkDerivation rec {
     alsa-lib
     libpthread-stubs
     libpulseaudio
-    libX11
-    libXcursor
-    libXdmcp
-    libXext
-    libXfixes
-    libXi
-    libXpm
-    libXt
-    libXxf86dga
-    libXxf86misc
-    libXxf86vm
+    libx11
+    libxcursor
+    libxdmcp
+    libxext
+    libxfixes
+    libxi
+    libxpm
+    libxt
+    libxxf86dga
+    libxxf86misc
+    libxxf86vm
     xorgproto
   ]
   ++ lib.optionals useSDL [
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 846982028885..8453364a447f 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -3,21 +3,21 @@
   stdenv,
   fetchurl,
   texinfo,
-  libXext,
+  libxext,
   xorgproto,
-  libX11,
-  libXpm,
-  libXt,
-  libXcursor,
+  libx11,
+  libxpm,
+  libxt,
+  libxcursor,
   alsa-lib,
   cmake,
   pkg-config,
   zlib,
   libpng,
   libvorbis,
-  libXxf86dga,
-  libXxf86misc,
-  libXxf86vm,
+  libxxf86dga,
+  libxxf86misc,
+  libxxf86vm,
   openal,
   libGLU,
   libGL,
@@ -43,19 +43,19 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     texinfo
-    libXext
+    libxext
     xorgproto
-    libX11
-    libXpm
-    libXt
-    libXcursor
+    libx11
+    libxpm
+    libxt
+    libxcursor
     alsa-lib
     zlib
     libpng
     libvorbis
-    libXxf86dga
-    libXxf86misc
-    libXxf86vm
+    libxxf86dga
+    libxxf86misc
+    libxxf86vm
     openal
     libGLU
     libGL
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 8ade3db0bf80..d0433feaac48 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -310,11 +310,11 @@
   libvpl,
   libvpx,
   libwebp,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
+  libxext,
   libxml2,
-  libXv,
+  libxv,
   nv-codec-headers,
   nv-codec-headers-12,
   ocl-icd, # OpenCL ICD
@@ -971,9 +971,9 @@ stdenv.mkDerivation (
       ++ optionals withXevd [ xevd ]
       ++ optionals withXeve [ xeve ]
       ++ optionals withXlib [
-        libX11
-        libXv
-        libXext
+        libx11
+        libxv
+        libxext
       ]
       ++ optionals withXml2 [ libxml2 ]
       ++ optionals withXvid [ xvidcore ]
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index db8b65fc1dae..b3531d024121 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -25,9 +25,9 @@
   buildPackages,
   gobject-introspection,
   enableX11 ? stdenv.hostPlatform.isLinux,
-  libXext,
-  libXi,
-  libXv,
+  libxext,
+  libxi,
+  libxv,
   libdrm,
   enableWayland ? stdenv.hostPlatform.isLinux,
   wayland-scanner,
@@ -111,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
   ]
   ++ lib.optionals enableX11 [
-    libXext
-    libXi
-    libXv
+    libxext
+    libxi
+    libxv
   ]
   ++ lib.optionals enableWayland [
     wayland
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 5215d7d78947..b494459c245a 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -4,9 +4,9 @@
   fetchzip,
   libGLU,
   libGL,
-  libXrandr,
-  libX11,
-  libXxf86vm,
+  libxrandr,
+  libx11,
+  libxxf86vm,
   zlib,
 }:
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation {
   buildInputs = [
     libGLU
     libGL
-    libXrandr
-    libX11
-    libXxf86vm
+    libxrandr
+    libx11
+    libxxf86vm
   ]
   ++ lib.optional stdenv.hostPlatform.isAarch64 zlib;
 
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index 44b971d50ad6..adfb5719c876 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -21,7 +21,7 @@
   libminc,
   libtiff,
   libpng,
-  libX11,
+  libx11,
   libuuid,
   patchelf,
   python ? null,
@@ -150,14 +150,14 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libuuid
   ]
   ++ lib.optionals (lib.versionAtLeast version "5.4") [ eigen ]
   ++ lib.optionals enablePython [ python ]
   ++ lib.optionals withVtk [ vtk ];
   # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9
-  # (specifically libGL and libX11 on Linux),
+  # (specifically libGL and libx11 on Linux),
   # it's now seemingly necessary for packages that configure ITK to
   # also include configuration deps of VTK, even if VTK is not required or available.
   # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935,
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 0fd204a75c70..bda5fe20d868 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -12,7 +12,7 @@
   knotifications,
   kpackage,
   kwidgetsaddons,
-  libXcursor,
+  libxcursor,
   qtx11extras,
 }:
 
@@ -29,7 +29,7 @@ mkDerivation {
     knotifications
     kpackage
     kwidgetsaddons
-    libXcursor
+    libxcursor
     qtx11extras
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 147dd2ebd0aa..766bc3dec3ed 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -10,7 +10,7 @@
   qtbase,
   qttools,
   qtx11extras,
-  libXdmcp,
+  libxdmcp,
 }:
 
 mkDerivation {
@@ -25,7 +25,7 @@ mkDerivation {
     kwindowsystem
     qttools
     qtx11extras
-    libXdmcp
+    libxdmcp
   ];
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ff5da40077aa..dd94f7131e7c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   qtbase,
   qttools,
   qtx11extras,
@@ -13,7 +13,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     qttools
     qtx11extras
   ];
diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix
index 9c6d2858b16b..9d2cae53e425 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/development/libraries/libopenshot-audio/default.nix
@@ -5,12 +5,12 @@
   alsa-lib,
   cmake,
   doxygen,
-  libX11,
-  libXcursor,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
   pkg-config,
   zlib,
 }:
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       else
         [
-          libX11
-          libXcursor
-          libXext
-          libXft
-          libXinerama
-          libXrandr
+          libx11
+          libxcursor
+          libxext
+          libxft
+          libxinerama
+          libxrandr
         ]
     );
 
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
index fac14e26ec44..95f6bcf688b7 100644
--- a/pkgs/development/libraries/libva/1.nix
+++ b/pkgs/development/libraries/libva/1.nix
@@ -3,11 +3,11 @@
   lib,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
   pkg-config,
-  libXext,
+  libxext,
   libdrm,
-  libXfixes,
+  libxfixes,
   wayland,
   wayland-scanner,
   libffi,
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!minimal) [
     libva1-minimal
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     wayland
     libffi
     libGL
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index f27c5bb59eb1..7e383fa49352 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -8,10 +8,10 @@
   wayland-scanner,
   libdrm,
   minimal ? false,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
-  libXfixes,
+  libxext,
+  libxfixes,
   wayland,
   libffi,
   libGL,
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
   ]
   ++ lib.optionals (!minimal) [
-    libX11
+    libx11
     libxcb
-    libXext
-    libXfixes
+    libxext
+    libxfixes
     wayland
     libffi
     libGL
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index f511599899d3..8b828e33d26e 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -7,9 +7,9 @@
   pkg-config,
   libdrm,
   libva,
-  libX11,
-  libXext,
-  libXfixes,
+  libx11,
+  libxext,
+  libxfixes,
   wayland,
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libdrm
     libva
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     wayland
   ];
 
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 6ae615dad5da..dbb478e62aba 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -9,13 +9,13 @@
   gtk-doc,
   docbook_xsl,
   docbook_xml_dtd_412,
-  libX11,
+  libx11,
   glib,
   gtk3,
   pango,
   cairo,
-  libXres,
-  libXi,
+  libxres,
+  libxi,
   libstartup_notification,
   gettext,
   gobject-introspection,
@@ -53,12 +53,12 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libstartup_notification
     pango
     cairo
-    libXres
-    libXi
+    libxres
+    libxi
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix
index a2b1af8024e3..c2c9d50f2bf7 100644
--- a/pkgs/development/libraries/libwpe/default.nix
+++ b/pkgs/development/libraries/libwpe/default.nix
@@ -7,7 +7,7 @@
   libxkbcommon,
   libGL,
   ninja,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxkbcommon
     libGL
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index 1552e5caaee2..9c662b02c71d 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -12,7 +12,7 @@
   libwpe,
   libxkbcommon,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     libwpe
     libxkbcommon
     libGL
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 137857b8c1df..00a1ef96000e 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -18,13 +18,13 @@
   libGLU,
   libice,
   libsm,
-  libX11,
-  libXaw,
-  libXmu,
-  libXrandr,
-  libXrender,
-  libXt,
-  libXxf86vm,
+  libx11,
+  libxaw,
+  libxmu,
+  libxrandr,
+  libxrender,
+  libxt,
+  libxxf86vm,
   xorgproto,
   # optional
   withNvidiaCg ? false,
@@ -86,13 +86,13 @@ let
         libGLU
         libice
         libsm
-        libX11
-        libXaw
-        libXmu
-        libXrandr
-        libXrender
-        libXt
-        libXxf86vm
+        libx11
+        libxaw
+        libxmu
+        libxrandr
+        libxrender
+        libxt
+        libxxf86vm
         xorgproto
       ]
       ++ lib.optionals withNvidiaCg [
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 8b83ec4d8c08..5e39b035877e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -26,12 +26,12 @@
   harfbuzz,
   icu,
   libdrm,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrender,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrender,
   libjpeg,
   libpng,
   libxcb,
@@ -124,11 +124,11 @@ stdenv.mkDerivation (
           libdrm
 
           # X11 libs
-          libX11
-          libXcomposite
-          libXext
-          libXi
-          libXrender
+          libx11
+          libxcomposite
+          libxext
+          libxi
+          libxrender
           libxcb
           libxkbcommon
           libxcb-util
@@ -318,9 +318,9 @@ stdenv.mkDerivation (
             "-w"
           ]
           ++ [
-            ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+            ''-DNIXPKGS_QTCOMPOSE="${libx11.out}/share/X11/locale"''
             ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
-            ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+            ''-DNIXPKGS_LIBXCURSOR="${libxcursor.out}/lib/libXcursor"''
           ]
           ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
           ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
@@ -459,17 +459,17 @@ stdenv.mkDerivation (
             "-xcb"
             "-qpa xcb"
             "-L"
-            "${libX11.out}/lib"
+            "${libx11.out}/lib"
             "-I"
-            "${libX11.out}/include"
+            "${libx11.out}/include"
             "-L"
-            "${libXext.out}/lib"
+            "${libxext.out}/lib"
             "-I"
-            "${libXext.out}/include"
+            "${libxext.out}/include"
             "-L"
-            "${libXrender.out}/lib"
+            "${libxrender.out}/lib"
             "-I"
-            "${libXrender.out}/include"
+            "${libxrender.out}/include"
 
             "-${lib.optionalString (cups == null) "no-"}cups"
             "-dbus-linked"
diff --git a/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
index 0c9557606156..12a1552d4767 100644
--- a/pkgs/development/libraries/qt-5/modules/qtsystems.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
@@ -4,7 +4,7 @@
   lib,
   bluez,
   libevdev,
-  libX11,
+  libx11,
   pkg-config,
   qtbase,
   udev,
@@ -34,7 +34,7 @@ qtModule {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     bluez
     libevdev
-    libX11
+    libx11
     udev
   ];
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 61aac879b93f..7e59defa4f05 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -25,10 +25,10 @@
   xrandr,
   libxkbfile,
   libpciaccess,
-  libXcursor,
-  libXScrnSaver,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxscrnsaver,
+  libxrandr,
+  libxtst,
   fontconfig,
   freetype,
   harfbuzz,
@@ -382,11 +382,11 @@ qtModule (
 
       # X11 libs
       xrandr
-      libXScrnSaver
-      libXcursor
-      libXrandr
+      libxscrnsaver
+      libxcursor
+      libxrandr
       libpciaccess
-      libXtst
+      libxtst
       libxcomposite
       libxdamage
       libdrm
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index b78f7defa8c9..040041f93b3c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -43,11 +43,11 @@
   glib,
   harfbuzz,
   icu,
-  libX11,
-  libXcomposite,
-  libXext,
-  libXi,
-  libXrender,
+  libx11,
+  libxcomposite,
+  libxext,
+  libxi,
+  libxrender,
   libjpeg,
   libpng,
   libxcb,
@@ -152,11 +152,11 @@ stdenv.mkDerivation {
     fontconfig
     freetype
     # X11 libs
-    libX11
-    libXcomposite
-    libXext
-    libXi
-    libXrender
+    libx11
+    libxcomposite
+    libxext
+    libxi
+    libxrender
     libxcb
     libxkbcommon
     libxcb-util
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index 16c9f4d501a6..0b29cd3b5e4e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -20,7 +20,7 @@
   libpulseaudio,
   pipewire,
   wayland,
-  libXrandr,
+  libxrandr,
   elfutils,
   libunwind,
   orc,
@@ -42,7 +42,7 @@ qtModule {
     pipewire
     alsa-lib
     wayland
-    libXrandr
+    libxrandr
     libva
   ]
   ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index b53dda10fcbf..1ce150c481d1 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -21,12 +21,12 @@
   xrandr,
   libxkbfile,
   libpciaccess,
-  libXcursor,
-  libXScrnSaver,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxscrnsaver,
+  libxrandr,
+  libxtst,
   libxshmfence,
-  libXi,
+  libxi,
   cups,
   fontconfig,
   freetype,
@@ -254,17 +254,17 @@ qtModule {
 
     # X11 libs
     xrandr
-    libXScrnSaver
-    libXcursor
-    libXrandr
+    libxscrnsaver
+    libxcursor
+    libxrandr
     libpciaccess
-    libXtst
+    libxtst
     libxcomposite
     libxdamage
     libdrm
     libxkbfile
     libxshmfence
-    libXi
+    libxi
     libxext
 
     # Pipewire
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 54ab47e2db21..f27ae2919f7a 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -10,8 +10,8 @@
   qtx11extras ? null, # Qt 5 only
   kwindowsystem,
   qtwayland,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   qttools,
   wrapQtAppsHook,
   gitUpdater,
@@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qtbase
     qtsvg
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals isQt5 [ qtx11extras ]
   ++ lib.optionals (!isQt5) [
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 77b459ac56a9..65270be3e345 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -4,7 +4,7 @@
   src,
   pkg-config,
   tcl,
-  libXft,
+  libxft,
   zip,
   zlib,
   patches ? [ ],
@@ -80,7 +80,7 @@ tcl.mkTclDerivation {
   ];
 
   propagatedBuildInputs = [
-    libXft
+    libxft
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 3593e438f794..09df550969a4 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -74,10 +74,10 @@
   viskores,
   freetype,
   fontconfig,
-  libX11,
-  libXfixes,
-  libXrender,
-  libXcursor,
+  libx11,
+  libxfixes,
+  libxrender,
+  libxcursor,
   gl2ps,
   libGL,
   qt6,
@@ -156,9 +156,9 @@ stdenv.mkDerivation (finalAttrs: {
     vtkPackages.pdal
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXfixes
-    libXrender
-    libXcursor
+    libxfixes
+    libxrender
+    libxcursor
   ]
   ++ lib.optional withQt6 qt6.qttools
   ++ lib.optional mpiSupport mpi
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
     llvmPackages.openmp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
     gl2ps
   ]
   # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do
diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix
index f95f2bef0b11..8600b6082c89 100644
--- a/pkgs/development/ocaml-modules/graphics/default.nix
+++ b/pkgs/development/ocaml-modules/graphics/default.nix
@@ -3,8 +3,8 @@
   fetchFromGitHub,
   buildDunePackage,
   dune-configurator,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
 }:
 
 buildDunePackage (finalAttrs: {
@@ -20,8 +20,8 @@ buildDunePackage (finalAttrs: {
 
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 6a5a696aa20e..beaea2284c37 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -17,15 +17,13 @@
   pango,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "ocaml-cairo";
-in
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
+    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${finalAttrs.version}.zip";
     sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
   };
 
@@ -75,4 +73,4 @@ stdenv.mkDerivation rec {
     broken = lib.versionAtLeast ocaml.version "4.06";
     inherit (ocaml.meta) platforms;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix
index 17708d871d2c..ec95db2aa769 100644
--- a/pkgs/development/ocaml-modules/raylib/default.nix
+++ b/pkgs/development/ocaml-modules/raylib/default.nix
@@ -8,11 +8,11 @@
   integers,
   patch,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
 }:
 
 buildDunePackage rec {
@@ -45,11 +45,11 @@ buildDunePackage rec {
     ctypes
     integers
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 184b4c486d4b..05bfadc29661 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "11.1.1";
+  version = "11.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-D0QxCnwyXtHvcx+BaO4mzGuZxLZtgogQpHXvFckX9f8=";
+    hash = "sha256-9WZ8GlnlI1Coyvi1Aqtk0iVoREyohCLBnjg2kusP1cE=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/cobs/default.nix b/pkgs/development/python-modules/cobs/default.nix
index 1c7aa960017e..d96d4e15fa2d 100644
--- a/pkgs/development/python-modules/cobs/default.nix
+++ b/pkgs/development/python-modules/cobs/default.nix
@@ -36,5 +36,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/cmcqueen/cobs-python/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix
index 19cd14017d5f..d03003425523 100644
--- a/pkgs/development/python-modules/dronecan/default.nix
+++ b/pkgs/development/python-modules/dronecan/default.nix
@@ -27,5 +27,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://dronecan.github.io/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix
index 9d66911b0f98..39cde68b8c6b 100644
--- a/pkgs/development/python-modules/glcontext/default.nix
+++ b/pkgs/development/python-modules/glcontext/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   setuptools,
   libGL,
-  libX11,
+  libx11,
 }:
 
 buildPythonPackage rec {
@@ -24,13 +24,13 @@ buildPythonPackage rec {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
   ];
 
   postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) ''
     substituteInPlace glcontext/x11.cpp \
       --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
-      --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"'
+      --replace-fail '"libX11.so"' '"${libx11}/lib/libX11.so"'
     substituteInPlace glcontext/egl.cpp \
       --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
       --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"'
diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 3eff452ef759..710985352263 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -10,7 +10,7 @@
   setuptools,
   kivy-garden,
   libGL,
-  libX11,
+  libx11,
   mtdev,
   SDL2,
   SDL2_image,
@@ -73,7 +73,7 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
+    libx11
     mtdev
   ]
   ++ lib.optionals withGstreamer (
diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix
index 05f448396531..7d34225c2df7 100644
--- a/pkgs/development/python-modules/libpcap/default.nix
+++ b/pkgs/development/python-modules/libpcap/default.nix
@@ -62,5 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/libpcap/";
     changelog = "https://github.com/karpierz/libpcap/blob/${version}/CHANGES.rst";
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 4fb823a2a2dd..21db4a4f35bc 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   cmake,
   setuptools,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   libGL,
   openimageio,
   imath,
@@ -36,8 +36,8 @@ buildPythonPackage rec {
     imath
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXt
+    libx11
+    libxt
     libGL
   ];
 
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index a75fb8fd4a5d..d07dfb2c0254 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -64,7 +64,7 @@
   ipykernel,
 
   # required for headless detection
-  libX11,
+  libx11,
   wayland,
 
   # Reverse dependency
@@ -107,7 +107,7 @@ buildPythonPackage rec {
     + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
       # fix paths to libraries in dlopen calls (headless detection)
       substituteInPlace src/_c_internal_utils.cpp \
-        --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
+        --replace-fail libX11.so.6 ${libx11}/lib/libX11.so.6 \
         --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
     '';
 
diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix
index 35c8abc0e840..116c783435c4 100644
--- a/pkgs/development/python-modules/mistralai/default.nix
+++ b/pkgs/development/python-modules/mistralai/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mistralai";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "client-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KpZCUaitc5Gz5ZI7vEK0CEe4Eo+H6gS9FuKlqhyQDes=";
+    hash = "sha256-6OAMNlOLaa1GYkdA4zX/cUc3lX2T1VbuMZ6f9SshEt8=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix
index 91628b9cd51c..1c5dc9239a49 100644
--- a/pkgs/development/python-modules/moderngl/default.nix
+++ b/pkgs/development/python-modules/moderngl/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   fetchPypi,
   libGL,
-  libX11,
+  libx11,
   setuptools,
   glcontext,
   pkgs,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [
     libGL
-    libX11
+    libx11
   ];
 
   dependencies = [ glcontext ];
diff --git a/pkgs/development/python-modules/omemo/default.nix b/pkgs/development/python-modules/omemo/default.nix
index 8f4fa6a957df..56cd2ea8ead6 100644
--- a/pkgs/development/python-modules/omemo/default.nix
+++ b/pkgs/development/python-modules/omemo/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage rec {
   pname = "omemo";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "python-omemo";
     tag = "v${version}";
-    hash = "sha256-uA8Nv8xT6ROlE9eM/Oz2j5HsYtvWzKEu7DSd/ws+WZY=";
+    hash = "sha256-h1L/DdzssCwQzQDY32ACNcn/zmDsCz16x74+Qdyv6x4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 8b26fa54b75f..837d729561c2 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -17,8 +17,8 @@
   jinja2,
   lib,
   libGL,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   materialx,
   ninja,
   numpy,
@@ -128,8 +128,8 @@ buildPythonPackage rec {
     onetbb
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXt
+    libx11
+    libxt
   ]
   ++ lib.optionals withOsl [ osl ]
   ++ lib.optionals withUsdView [ qt6.qtbase ]
diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index 3b31952ddb1a..4a6731459eb1 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -58,5 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/pkg_about/";
     changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst";
     license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index ea6acc23c54d..364fdbc1a4d4 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "arc-swap"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+checksum = "9ded5f9a03ac8f24d1b8a25101ee812cd32cdc8c50a4c50237de2c4915850e73"
 dependencies = [
  "rustversion",
 ]
@@ -33,12 +33,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
 [[package]]
 name = "bitflags"
 version = "2.10.0"
@@ -141,15 +135,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "indoc"
-version = "2.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.17"
@@ -187,15 +172,6 @@ version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -229,9 +205,9 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "proc-macro2"
@@ -244,7 +220,7 @@ dependencies = [
 
 [[package]]
 name = "pycrdt"
-version = "0.12.45"
+version = "0.12.46"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -253,35 +229,32 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d"
+checksum = "fcf3ccafdf54c050be48a3a086d372f77ba6615f5057211607cd30e5ac5cec6d"
 dependencies = [
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6"
+checksum = "972720a441c91fd9c49f212a1d2d74c6e3803b231ebc8d66c51efbd7ccab11c8"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089"
+checksum = "5994456d9dab8934d600d3867571b6410f24fbd6002570ad56356733eb54859b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -289,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02"
+checksum = "11ce9cc8d81b3c4969748807604d92b4eef363c5bb82b1a1bdb34ec6f1093a18"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -301,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9"
+checksum = "eaf4b60036a154d23282679b658e3cc7d88d3b8c9a40b43824785f232d2e1b98"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -443,12 +416,6 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -526,6 +493,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.17"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439"
+checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 425148e72879..01f3033dd36c 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt";
-  version = "0.12.45";
+  version = "0.12.46";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = finalAttrs.version;
-    hash = "sha256-4J8aEjpO4kTXSOYI9JcFmu4kz8c2Mk3AZB6tTy8I2fM=";
+    hash = "sha256-rL6heeHg5uhLFt3qY+NKIEA4FLIR/MtwEqleq29DPA8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 2fe0735a56f4..787f04c413c9 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -101,5 +101,6 @@ buildPythonPackage rec {
     homepage = "https://opencyphal.org/";
     changelog = "https://github.com/OpenCyphal/pycyphal/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 6b02afb75f38..76810dad5f8c 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -17,7 +17,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   portmidi,
   SDL2,
   SDL2_image,
@@ -100,7 +100,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype
-    libX11
+    libx11
     libjpeg
     libpng
     portmidi
diff --git a/pkgs/development/python-modules/pygame-original/default.nix b/pkgs/development/python-modules/pygame-original/default.nix
index f88295bd3502..988a5fc26951 100644
--- a/pkgs/development/python-modules/pygame-original/default.nix
+++ b/pkgs/development/python-modules/pygame-original/default.nix
@@ -20,7 +20,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   portmidi,
   SDL2_image,
   SDL2_mixer,
@@ -100,7 +100,7 @@ buildPythonPackage rec {
     freetype
     libjpeg
     libpng
-    libX11
+    libx11
     portmidi
     SDL2
     (SDL2_image.override { enableSTB = false; })
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 93684b2441c7..9b441a73b899 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -17,16 +17,16 @@
   rapidjson,
   swig,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pythonocc-core";
-  version = "7.8.1.1";
+  # To avoid overriding opencascade-occt from 7.9.3 to 7.9.0. Go back to regular release next version.
+  version = "7.9.0-unstable-2025-12-31";
 
   src = fetchFromGitHub {
     owner = "tpaviot";
     repo = "pythonocc-core";
-    tag = version;
-    hash = "sha256-0o2PQEN0/Z7FUPZEo2HxFFa+mN2bZnYI++HVu4ONpNA=";
+    rev = "2f8f1a7d99312e8b3e81d0bb2adab9b1e717d37b";
+    hash = "sha256-fni6crPs58e8MUr2SfVHVD5nPFIEQcOfuAMLXJlWg88=";
   };
 
   nativeBuildInputs = [
@@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
     homepage = "https://github.com/tpaviot/pythonocc-core";
-    changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}";
+    changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index ea8bdccee52b..71886657bda6 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -3,9 +3,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
   poetry-core,
   pyobjc-framework-Cocoa,
   cython,
@@ -33,11 +33,11 @@ buildPythonPackage rec {
 
   postPatch = lib.optionalString (stdenv.isLinux) ''
     substituteInPlace screeninfo/enumerators/xinerama.py \
-      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \
-      --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libXinerama}/lib/libXinerama.so")'
+      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libx11}/lib/libX11.so")' \
+      --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libxinerama}/lib/libXinerama.so")'
     substituteInPlace screeninfo/enumerators/xrandr.py \
-      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \
-      --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libXrandr}/lib/libXrandr.so")'
+      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libx11}/lib/libX11.so")' \
+      --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libxrandr}/lib/libXrandr.so")'
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 8802cb45a94b..e33e4e871716 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -26,9 +26,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libglvnd,
   libgbm,
   pango,
@@ -103,9 +103,9 @@ buildPythonPackage rec {
     libGL
     libGLU
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libglvnd
     libgbm
     webkitgtk_4_1
diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 41bc146a0300..1a0aec24a8d3 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -25,7 +25,7 @@
   zlib,
   libGL,
   libxml2,
-  libX11,
+  libx11,
   python3Packages,
   llvm,
   khronos-ocl-icd-loader,
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     numactl
     libGL
     libxml2
-    libX11
+    libx11
     khronos-ocl-icd-loader
     hipClang
     libffi
diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index e822ccb73999..51679e85e8da 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -9,14 +9,14 @@
   installShellFiles,
   libGLU,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   makeWrapper,
   openssl,
   pkg-config,
@@ -57,14 +57,14 @@ stdenv.mkDerivation (self: {
     freetype
     libGLU
     libpulseaudio
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     openssl
     udev
     yasm
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index dc31e5036957..4c712a6feab1 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -29,15 +29,15 @@
   libpulseaudio,
   libtheora,
   libwebp,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXrender,
+  libxrandr,
+  libxrender,
   makeWrapper,
   mbedtls,
   miniupnpc,
@@ -323,11 +323,11 @@ let
                       prev.runtimeDependencies or [ ]
                       ++ map lib.getLib [
                         libpulseaudio
-                        libX11
-                        libXcursor
-                        libXext
-                        libXi
-                        libXrandr
+                        libx11
+                        libxcursor
+                        libxext
+                        libxi
+                        libxrandr
                         vulkan-loader
                       ]
                       ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -587,14 +587,14 @@ let
           ++ lib.optional withAlsa alsa-lib
           ++ lib.optional (withX11 || withWayland) libxkbcommon
           ++ lib.optionals withX11 [
-            libX11
-            libXcursor
-            libXext
-            libXfixes
-            libXi
-            libXinerama
-            libXrandr
-            libXrender
+            libx11
+            libxcursor
+            libxext
+            libxfixes
+            libxi
+            libxinerama
+            libxrandr
+            libxrender
           ]
           ++ lib.optionals withWayland [
             libdecor
diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix
index b4dcd5ef7dd5..4a3da8714817 100644
--- a/pkgs/development/tools/misc/yakut/default.nix
+++ b/pkgs/development/tools/misc/yakut/default.nix
@@ -55,5 +55,6 @@ buildPythonApplication rec {
     '';
     homepage = "https://github.com/OpenCyphal/yakut/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix
index 0bf3e5160526..1dec67697ee7 100644
--- a/pkgs/development/tools/replay-io/default.nix
+++ b/pkgs/development/tools/replay-io/default.nix
@@ -6,9 +6,9 @@
   autoPatchelfHook,
   makeWrapper,
   libcxx,
-  libX11,
-  libXt,
-  libXdamage,
+  libx11,
+  libxt,
+  libxdamage,
   glib,
   gtk3,
   dbus-glib,
@@ -62,9 +62,9 @@ rec {
       dbus-glib
       glib
       gtk3
-      libX11
-      libXdamage
-      libXt
+      libx11
+      libxdamage
+      libxt
     ];
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 12f751a208b3..e88d88f234ce 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -15,9 +15,9 @@
   libice,
   libkrb5,
   libsm,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
+  libxi,
   libxkbcommon,
   libxml2_13,
   ncurses,
@@ -56,9 +56,9 @@ stdenv.mkDerivation {
     libice
     libkrb5
     libsm
-    libX11
+    libx11
     libxcb
-    libXi
+    libxi
     libxkbcommon
     libxml2_13
     ncurses
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index beac46a4bdb6..4003d077365d 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -12,10 +12,10 @@
   at-spi2-atk,
   expat,
   glib,
-  libXcomposite,
-  libXdamage,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxfixes,
+  libxrandr,
   libgbm,
   libgcc,
   libxkbcommon,
@@ -47,10 +47,10 @@ let
       at-spi2-atk
       expat
       glib
-      libXcomposite
-      libXdamage
-      libXfixes
-      libXrandr
+      libxcomposite
+      libxdamage
+      libxfixes
+      libxrandr
       libgbm
       libgcc.lib
       libxkbcommon
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 19eaf0f97f79..a970fc7a0fd2 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -10,7 +10,7 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
-  libX11,
+  libx11,
   freetype,
   zlib,
   debug,
@@ -32,7 +32,7 @@ let
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libX11
+    libx11
     freetype
   ];
 
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index e957a80bbd0e..3b5fe45441b0 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -9,7 +9,7 @@
   curl,
   libtorrent-rasterbar,
   libpng,
-  libX11,
+  libx11,
   gettext,
   boost,
   libnotify,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     jsoncpp
     boost
     libpng
-    libX11
+    libx11
     libnotify
     gtk3
     glib
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4855f9339003..04acf2b5fb5d 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   glibc,
-  libX11,
+  libx11,
   runtimeShell,
   libGLU,
   libGL,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
              --set-rpath ${
                lib.makeLibraryPath [
                  stdenv.cc.cc
-                 libX11
+                 libx11
                  libGLU
                  libGL
                ]
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 7632190672b7..a0de27407762 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -17,13 +17,13 @@
   freetype,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   # glx
   libGLU,
   libGL,
-  libXpm,
-  libXext,
-  libXxf86vm,
+  libxpm,
+  libxext,
+  libxxf86vm,
   alsa-lib,
   # sdl
   SDL2,
@@ -100,14 +100,14 @@ let
       libvorbis
       curl
       gmp
-      libX11
+      libx11
     ]
     ++ lib.optionals withGLX [
       libGLU
       libGL
-      libXpm
-      libXext
-      libXxf86vm
+      libxpm
+      libxext
+      libxxf86vm
       alsa-lib
     ]
     ++ lib.optionals withSDL [ SDL2 ];
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index c9ba00d790b0..c792d6e51724 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -10,7 +10,7 @@
   # dependencies
   glib,
   libxfixes,
-  libXinerama,
+  libxinerama,
   catch2,
   gperf,
 
@@ -40,7 +40,7 @@
   wayland-protocols,
   wayland-scanner,
   xdamageSupport ? x11Support,
-  libXdamage ? null,
+  libxdamage ? null,
   doubleBufferSupport ? x11Support,
   imlib2Support ? x11Support,
   imlib2 ? null,
@@ -76,7 +76,7 @@ assert docsSupport -> pandoc != null && python3 != null;
 
 assert ncursesSupport -> ncurses != null;
 
-assert xdamageSupport -> x11Support && libXdamage != null;
+assert xdamageSupport -> x11Support && libxdamage != null;
 assert imlib2Support -> x11Support && imlib2 != null;
 assert luaSupport -> lua != null;
 assert luaImlib2Support -> luaSupport && imlib2Support && toluapp != null;
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
-    libXinerama
+    libxinerama
   ]
   ++ lib.optional ncursesSupport ncurses
   ++ lib.optionals x11Support [
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
   ]
-  ++ lib.optional xdamageSupport libXdamage
+  ++ lib.optional xdamageSupport libxdamage
   ++ lib.optional imlib2Support imlib2
   ++ lib.optional luaSupport lua
   ++ lib.optional luaImlib2Support imlib2
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 8f38cffa1faf..e47dc3cb4e61 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -12,10 +12,10 @@ nvidia_x11: sha256:
   dbus,
   vulkan-headers,
   gtk3,
-  libXv,
-  libXrandr,
-  libXext,
-  libXxf86vm,
+  libxv,
+  libxrandr,
+  libxext,
+  libxxf86vm,
   libvdpau,
   librsvg,
   libglvnd,
@@ -44,8 +44,8 @@ let
     inherit src;
 
     buildInputs = [
-      libXrandr
-      libXext
+      libxrandr
+      libxext
     ];
 
     preBuild = ''
@@ -87,8 +87,8 @@ let
 
   runtimeDependencies = [
     libglvnd
-    libXrandr
-    libXv
+    libxrandr
+    libxv
   ];
 
   runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
@@ -143,10 +143,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     jansson
-    libXv
-    libXrandr
-    libXext
-    libXxf86vm
+    libxv
+    libxrandr
+    libxext
+    libxxf86vm
     libvdpau
     nvidia_x11
     dbus
diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
index 7cf7075a1500..05c4bfee3ce4 100644
--- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
+++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
@@ -9,11 +9,11 @@
   qtx11extras,
   wrapQtAppsHook,
   autoPatchelfHook,
-  libX11,
-  libXtst,
-  libXi,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxtst,
+  libxi,
+  libxrandr,
+  libxinerama,
 }:
 
 let
@@ -41,11 +41,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libusb1
-    libX11
-    libXtst
-    libXi
-    libXrandr
-    libXinerama
+    libx11
+    libxtst
+    libxi
+    libxrandr
+    libxinerama
     glibc
     libGL
     (lib.getLib stdenv.cc.cc)
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 137be8f9ef71..1da0f478b46c 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-jena";
-  version = "5.6.0";
+  version = "6.0.0";
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
-    hash = "sha256-s5qmzKBrED7U1Qm0Lu5RI5QIiFnfK1NnqFiSe/H85yg=";
+    hash = "sha256-N8TPKExwUNdlrPB23/qQm08io/JHq3bDzVoCd8ot6VQ=";
   };
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 6eb02d6947d8..254a29aea333 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -17,10 +17,10 @@
   lua,
   withCaca ? false,
   libcaca,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
+  libx11,
+  libxt,
+  libxpm,
+  libxaw,
   aquaterm ? false,
   withWxGTK ? false,
   wxGTK32,
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
   ++ lib.optional withLua lua
   ++ lib.optional withCaca libcaca
   ++ lib.optionals withX [
-    libX11
-    libXpm
-    libXt
-    libXaw
+    libx11
+    libxpm
+    libxt
+    libxaw
   ]
   ++ lib.optionals withQt [
     qtbase
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index 767c95770940..aab550797ac2 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -11,7 +11,7 @@
   xdg-utils,
   dbus,
   libGL,
-  libX11,
+  libx11,
   hwdata,
   mangohud32,
   addDriverRunpath,
@@ -27,7 +27,7 @@
   spdlog,
   libxkbcommon,
   glfw,
-  libXrandr,
+  libxrandr,
   x11Support ? true,
   waylandSupport ? true,
   nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       libdbus = dbus.lib;
       libGL = libGL;
-      libX11 = libX11;
+      libX11 = libx11;
       inherit hwdata;
     })
   ];
@@ -191,12 +191,12 @@ stdenv.mkDerivation (finalAttrs: {
     spdlog
   ]
   ++ lib.optional waylandSupport wayland
-  ++ lib.optional x11Support libX11
+  ++ lib.optional x11Support libx11
   ++ lib.optional nvidiaSupport libXNVCtrl
   ++ lib.optional (x11Support || waylandSupport) libxkbcommon
   ++ lib.optionals mangoappSupport [
     glfw
-    libXrandr
+    libxrandr
   ];
 
   doCheck = true;
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 1542834e4a70..37ea60c03057 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -5,7 +5,7 @@
   libGL,
   libGLU,
   libglut,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     libglut
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix
index 053a43006461..5b7257b24903 100644
--- a/pkgs/tools/graphics/vkbasalt/default.nix
+++ b/pkgs/tools/graphics/vkbasalt/default.nix
@@ -6,7 +6,7 @@
   meson,
   ninja,
   pkg-config,
-  libX11,
+  libx11,
   spirv-headers,
   vulkan-headers,
   vkbasalt32,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     spirv-headers
     vulkan-headers
   ];
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 44b360e28d15..88f7d8193c78 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -6,7 +6,7 @@
   imagemagickBig,
   pkg-config,
   withXorg ? true,
-  libX11,
+  libx11,
   libv4l,
   qtbase,
   qtwayland,
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     dbus
   ]
   ++ lib.optionals withXorg [
-    libX11
+    libx11
   ]
   ++ lib.optionals enableVideo [
     libv4l
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 9eb8b05a05fa..236be8942ad3 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -23,7 +23,7 @@
   libGL,
   libuuid,
   libselinux,
-  libXdmcp,
+  libxdmcp,
   libsepol,
   libxkbcommon,
   libthai,
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     libuuid
     libselinux
     libsepol
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libxcb-util
     libxcb-wm
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index 3d7725904916..25fde5ca0b40 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -17,12 +17,12 @@
   libsepol,
   libthai,
   libdatrie,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   withGTK2 ? false,
 }:
 
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
     libsepol
     libthai
     libdatrie
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
   ]
   ++ lib.optional withGTK2 gtk2;
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 74df7eefb93d..4437b30dc434 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -38,7 +38,7 @@
   nixosTests,
   versionCheckHook,
   nix-update-script,
-  libX11,
+  libx11,
   libOnly ? false,
 }:
 
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3 # for pygobject overrides
     isocodes
     json-glib
-    libX11
+    libx11
     vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
   ]
   ++ lib.optionals (!libOnly) [
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index 89149abffb32..48b7872c9c84 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -3,8 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   libXNVCtrl,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     libXNVCtrl
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   # Needed for static linking
   preConfigure = ''
-    export LIBRARY_PATH=${libXNVCtrl}/lib:${libX11}/lib:${libXext}/lib
+    export LIBRARY_PATH=${libXNVCtrl}/lib:${libx11}/lib:${libxext}/lib
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 084944001c48..fc02f9e2a040 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -6,7 +6,7 @@
   cabextract,
   curl,
   gnupg,
-  libX11,
+  libx11,
   libGLU,
   libGL,
   wine-staging,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wine_custom
-    libX11
+    libx11
     libGLU
     libGL
     curl
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 23861b295af7..917aef1ce2bb 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -6,8 +6,8 @@
   cmake,
   qttools,
   wrapQtAppsHook,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   qtbase,
   qtx11extras,
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     qtbase
     qtx11extras
   ];
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index f1d2c7470477..5299fde25113 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -6,7 +6,7 @@
   wrapQtAppsHook,
   qtbase,
   qtcharts,
-  libXrandr,
+  libxrandr,
   libdrm,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtcharts
-    libXrandr
+    libxrandr
     libdrm
   ];
 
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index aa8cdeb74f26..cea81636451e 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   xorgproto,
   perl, # For building web manuals
   which,
@@ -53,9 +53,9 @@ stdenv.mkDerivation {
       [
         fontconfig
         freetype # fontsrv uses these
-        libX11
-        libXext
-        libXt
+        libx11
+        libxext
+        libxt
         xorgproto
       ]
     else
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     CC9='$(command -v $CC)'
     CFLAGS='$NIX_CFLAGS_COMPILE'
     LDFLAGS='$(for f in $NIX_LDFLAGS; do echo "-Wl,$f"; done | xargs echo)'
-    ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libXt.dev}/include'"}
+    ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libxt.dev}/include'"}
     EOF
 
     # make '9' available in the path so there's some way to find out $PLAN9
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 613436679c20..76ee8beeb461 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -841,6 +841,7 @@ mapAliases {
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
+  helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05
   HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
@@ -1017,8 +1018,36 @@ mapAliases {
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libWindowsWM = libwindowswm; # Added 2026-01-19
   libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
+  libX11 = libx11; # Added 2026-02-06
+  libXau = libxau; # Added 2026-02-06
+  libXaw = libxaw; # Added 2026-02-06
+  libXcomposite = libxcomposite; # Added 2026-02-06
+  libXcursor = libxcursor; # Added 2026-02-06
+  libXdamage = libxdamage; # Added 2026-02-06
+  libXdmcp = libxdmcp; # Added 2026-02-06
+  libXext = libxext; # Added 2026-02-06
+  libXfixes = libxfixes; # Added 2026-02-06
+  libXfont2 = libxfont_2; # Added 2026-02-06
   libXfont = libxfont_1; # Added 2026-01-19
+  libXft = libxft; # Added 2026-02-06
+  libXi = libxi; # Added 2026-02-06
+  libXinerama = libxinerama; # Added 2026-02-06
+  libXmu = libxmu; # Added 2026-02-06
+  libXp = libxp; # Added 2026-02-06
+  libXpm = libxpm; # Added 2026-02-06
+  libXpresent = libxpresent; # Added 2026-02-06
+  libXrandr = libxrandr; # Added 2026-02-06
+  libXrender = libxrender; # Added 2026-02-06
+  libXres = libxres; # Added 2026-02-06
+  libXScrnSaver = libxscrnsaver; # Added 2026-02-06
+  libXt = libxt; # Added 2026-02-06
   libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
+  libXtst = libxtst; # Added 2026-02-06
+  libXv = libxv; # Added 2026-02-06
+  libXvMC = libxvmc; # Added 2026-02-06
+  libXxf86dga = libxxf86dga; # Added 2026-02-06
+  libXxf86misc = libxxf86misc; # Added 2026-02-06
+  libXxf86vm = libxxf86vm; # Added 2026-02-06
   lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3037b900767e..03e6cca1aa83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7299,13 +7299,6 @@ with pkgs;
       url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
       hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18=";
     };
-    patches = [
-      # Backport GCC 14 build fix
-      (fetchpatch {
-        url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch";
-        hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
-      })
-    ];
   };
 
   opencascade-occt_7_6_1 = opencascade-occt.overrideAttrs {
@@ -8830,34 +8823,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libX11 = libx11;
-  libXau = libxau;
-  libXaw = libxaw;
-  libXcomposite = libxcomposite;
-  libXcursor = libxcursor;
-  libXdamage = libxdamage;
-  libXdmcp = libxdmcp;
-  libXext = libxext;
-  libXfixes = libxfixes;
-  libXfont2 = libxfont_2;
-  libXft = libxft;
-  libXi = libxi;
-  libXinerama = libxinerama;
-  libXmu = libxmu;
-  libXp = libxp;
-  libXpm = libxpm;
-  libXpresent = libxpresent;
-  libXrandr = libxrandr;
-  libXrender = libxrender;
-  libXres = libxres;
-  libXScrnSaver = libxscrnsaver;
-  libXt = libxt;
-  libXtst = libxtst;
-  libXv = libxv;
-  libXvMC = libxvmc;
-  libXxf86dga = libxxf86dga;
-  libXxf86misc = libxxf86misc;
-  libXxf86vm = libxxf86vm;
   mkfontdir = mkfontscale;
   xcbproto = xcb-proto;