Clean up pkgs

aliases/nixpkgs.nix

@@ -33,12 +33,15 @@ mapAliases {
   armTrustedFirmwareRK3588 = arm-trusted-firmware.rk3588;
   armTrustedFirmwareS905 = arm-trusted-firmware.s905;
   armTrustedFirmwareTools = arm-trusted-firmware.tools;
+  at-spi2-atk = at-spi2-core; # merged into at-spi2-core
+  atk = at-spi2-core; # merged into at-spi2-core
   autoconf269 = autoconf.v2_69;
   autoconf271 = autoconf.v2_71;
   automake116x = automake.v1_16;
   automake118x = automake.v1_18;
   autoreconfHook269 = autoconf.v2_69.autoreconfHook;
   autoreconfHook271 = autoconf.v2_71.autoreconfHook;
+  bashInteractiveFHS = bashFHS;
   binutils-unwrapped = binutils.unwrapped;
   binutils-unwrapped-all-targets = binutils.unwrapped-all-targets;
   binutils-unwrapped_2_38 = binutils.unwrapped.v2_38;
@@ -51,7 +54,14 @@ mapAliases {
   buildGo125Module = go.v1_25.buildModule;
   buildGo126Module = go.v1_26.buildModule;
   buildGo127Module = go.v1_27.buildModule;
+  buildGradlePackage = java.buildGradlePackage;
+  buildMavenPackage = java.buildMavenPackage;
+  buildNpmApplication = nodejs.buildNpmApplication;
+  buildPnpmApplication = nodejs.buildPnpmApplication;
+  buildYarnApplication = nodejs.buildYarnApplication;
   bzip2_1_1 = throw "'bzip2_1_1' has been removed as it was an unmaintained 2020 snapshot; use 'bzip2' instead";
+  clang-manpages = llvmPackages.clang-manpages;
+  clang-tools = llvmPackages.clang-tools;
   clang_18 = llvm.v18.pkgs.clang;
   clang_19 = llvm.v19.pkgs.clang;
   clang_20 = llvm.v20.pkgs.clang;
@@ -93,10 +103,12 @@ mapAliases {
   fftwLongDouble = fftw.long_double;
   fftwQuad = fftw.quad;
   fftwSinglePrec = fftw.float;
+  flang = llvm.v20.pkgs.flang;
   flang_20 = llvm.v20.pkgs.flang;
   flang_21 = llvm.v21.pkgs.flang;
   flex_2_5_39 = flex.v2_5;
   fuse3 = fuse;
+  glfw = glfw3;
   gmp6 = gmp.v6_3;
   gmpxx = gmp.withCxx;
   gnugrep = grep;
@@ -138,11 +150,14 @@ mapAliases {
   kernelPackagesExtensions = throw "kernelPackagesExtensions has been removed in ekapkgs. Use config.overlays.linux instead";
   kotlinc = kotlin;
   libcIconv = libc: callPackage ../pkgs-many/libiconv/libc.nix { inherit libc; };
+  libclang = llvmPackages.libclang;
+  libclc = llvmPackages.libclc;
   libffiReal = libffi.real;
   libffi_3_3 = libffi.v3_3;
   libiconv-darwin = libiconv.darwin;
   libiconvReal = libiconv.real;
   libidn2 = libidn.v2;
+  libllvm = llvmPackages.libllvm;
   libmpg123 = mpg123;
   libmysqlclient = mariadb-connector-c;
   libnghttp2 = nghttp2;
@@ -162,10 +177,12 @@ mapAliases {
   lld_19 = llvm.v19.pkgs.lld;
   lld_20 = llvm.v20.pkgs.lld;
   lld_21 = llvm.v21.pkgs.lld;
+  lldb = llvmPackages.lldb;
   lldb_18 = llvm.v18.pkgs.lldb;
   lldb_19 = llvm.v19.pkgs.lldb;
   lldb_20 = llvm.v20.pkgs.lldb;
   lldb_21 = llvm.v21.pkgs.lldb;
+  llvm-manpages = llvmPackages.llvm-manpages;
   llvm_18 = llvm.v18.pkgs.llvm;
   llvm_19 = llvm.v19.pkgs.llvm;
   llvm_20 = llvm.v20.pkgs.llvm;
@@ -180,9 +197,11 @@ mapAliases {
   lua5_4_compat = lua.v5_4_compat;
   lua5_5 = lua.v5_5;
   lua5_5_compat = lua.v5_5_compat;
+  luajitPackages = lua.luajit_2_1.pkgs;
   luajit_2_0 = lua.luajit_2_0;
   luajit_2_1 = lua.luajit_2_1;
   luajit_openresty = lua.luajit_openresty;
+  luarocks = luaPackages.luarocks_bootstrap;
   makeInitrd = linux.makeInitrd;
   makeModulesClosure = linux.makeModulesClosure;
   man = man-db;
@@ -191,10 +210,12 @@ mapAliases {
   ncurses5 = ncurses.v5;
   ncurses6 = ncurses.v6;
   nimble = nim;
+  nixStatic = pkgsStatic.nix;
   nodejs_18 = nodejs.v18;
   nodejs_20 = nodejs.v20;
   nodejs_22 = nodejs.v22;
   nodejs_23 = nodejs.v23;
+  nodejs_latest = nodejs.v26;
   openjdk = java;
   openjdk11 = java.v11;
   openssl_1_1 = openssl.v1_1;
@@ -207,15 +228,31 @@ mapAliases {
   perl542 = perl.v5_42;
   perl542Packages = lib.recurseIntoAttrs perl.v5_42.pkgs;
   phpExtensions = php.buildPecl;
+  pypy27Packages = pypy27.pkgs;
+  pypy2Packages = pypy2.pkgs;
+  pypy310Packages = pypy310.pkgs;
+  pypy311Packages = pypy311.pkgs;
+  pypy3Packages = pypy3.pkgs;
+  pypyPackages = pypy.pkgs;
+  python27Packages = python27.pkgs;
+  python310Packages = python310.pkgs;
+  python311Packages = python311.pkgs;
+  python314Packages = python314.pkgs;
+  python315Packages = python315.pkgs;
   qemu-utils = qemu;
   r = r-lang;
   rLang = r-lang;
   scala_2_13 = scala.v2_13;
   scala_3 = scala;
+  strip-nondeterminism = perlPackages.strip-nondeterminism;
   su = shadow;
   tcl-8_5 = tcl.v8_5;
   tcl-8_6 = tcl.v8_6;
   tcl-9_0 = tcl.v9_0;
+  tclPackages = tcl.pkgs;
+  texinfo6 = texinfo.v6;
+  texinfo7 = texinfo.v7;
+  texinfoInteractive = texinfo.interactive;
   tk-8_5 = tk.v8_5;
   tk-8_6 = tk.v8_6;
   tk-9_0 = tk.v9_0;
@@ -284,6 +321,7 @@ mapAliases {
   ubootUtilite = uboot.ubootUtilite;
   ubootVisionFive2 = uboot.ubootVisionFive2;
   ubootWandboard = uboot.ubootWandboard;
+  valgrind-light = valgrind.light;
   wafHook = waf.hook;
   webrtc-audio-processing_0_3 = webrtc-audio-processing.v0_3;
   webrtc-audio-processing_1 = webrtc-audio-processing.v1;
@@ -296,6 +334,8 @@ mapAliases {
   wrapGAppsNoGuiHook = gtk3.wrapGAppsNoGuiHook;
   wrapRustc = rustPackages.wrapRustc;
   wrapRustcWith = rustPackages.wrapRustcWith;
+  xcodebuild = xcbuild;
+  xorriso = libisoburn;
   xxHash = xxhash;
   # keep-sorted end
 

pkgs-many/binutils/darwin.nix

@@ -5,7 +5,7 @@
   clang-unwrapped,
   ld64,
   llvm,
-  llvm-manpages,
+  llvmPackages,
   makeWrapper,
   enableManpages ? stdenvNoCC.targetPlatform == stdenvNoCC.hostPlatform,
 }:
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation {
       if [ -e "$llvmPath/$llvmTool" ]; then
         ln -s "$llvmPath/$llvmTool" "$out/bin/${targetPrefix}$cctoolsTool"
       fi
-      ${linkManPages llvm-manpages "$llvmTool" "$cctoolsTool"}
+      ${linkManPages llvmPackages.llvm-manpages "$llvmTool" "$cctoolsTool"}
     done
 
     for tool in ${toString cctools_cmds}; do

pkgs-many/nix/generic.nix

@@ -142,8 +142,10 @@ basePackage.overrideAttrs (oldAttrs: {
     // mkVariantPassthru variantArgs
     // {
       inherit variantArgs;
-      # Individual component packages are accessible via nixVersions.nixComponents_2_X
-      # (not via passthru.pkgs) to avoid infinite recursion with the splice infrastructure.
+      # The spliced component scope. nixVersions collects these for the splice
+      # infrastructure (generateSplicesForMkScope ["nixVersions" "nixComponents_2_X"]).
+      # Accessing passthru does NOT force derivation evaluation, so this is safe.
+      pkgs = nixComponents;
       ekapkgs-update.skip = false;
       ekapkgs-update.semver-strategy = "patch";
     };

pkgs/OVMF/default.nix

@@ -8,7 +8,7 @@
   llvmPackages,
   fetchFromGitLab,
   python3,
-  xorriso,
+  libisoburn,
   qemu,
   dosfstools,
   mtools,
@@ -18,7 +18,7 @@
   systemManagementModeRequired ? secureBoot && stdenv.hostPlatform.isx86,
   # Whether to create an nvram variables template
   # which includes the MSFT secure boot keys
-  # Note: Requires pexpect, xorriso, and mtools to be available
+  # Note: Requires pexpect, libisoburn, and mtools to be available
   msVarsTemplate ? false,
   # When creating the nvram variables template with
   # the MSFT keys, we also must provide a certificate
@@ -123,7 +123,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
   ++ lib.optionals msVarsTemplate [
     python3
     python3.pkgs.pexpect
-    xorriso
+    libisoburn
     qemu
     dosfstools
     mtools

pkgs/buildFHSEnvBubblewrap/buildFHSEnv.nix

@@ -70,7 +70,7 @@ let
     glibcLocales
     (if isMultiBuild then glibc_multi else glibc)
     gcc.cc.lib
-    bashInteractiveFHS
+    bashFHS
     coreutils
     less
     shadow

pkgs/buildFHSEnvChroot/env.nix

@@ -55,7 +55,7 @@ let
     glibcLocales
     (if isMultiBuild then glibc_multi else glibc)
     (toString gcc.cc.lib)
-    bashInteractiveFHS
+    bashFHS
     coreutils
     less
     shadow

pkgs/ccache/default.nix

@@ -13,7 +13,7 @@
   zstd,
   bashInteractive,
   doctest,
-  xcodebuild,
+  xcbuild,
   makeWrapper,
   writableTmpDirAsHomeHook,
 }:

pkgs/defaultCrateOverrides/default.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   alsa-lib,
-  atk,
+  at-spi2-core,
   autoconf,
   automake,
   cairo,
@@ -407,7 +407,7 @@
 
   atk-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ atk ];
+    buildInputs = [ at-spi2-core ];
   };
 
   # Assumes it can run Command::new(env::var("CARGO")).arg("locate-project")

pkgs/gtk/3.x.nix

@@ -20,8 +20,7 @@
   cairo,
   pango,
   gdk-pixbuf,
-  atk,
-  at-spi2-atk,
+  at-spi2-core,
   gobject-introspection,
   buildPackages,
   withIntrospection ?
@@ -150,8 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
   #TODO: colord?
 
   propagatedBuildInputs = [
-    at-spi2-atk
-    atk
+    at-spi2-core
     cairo
     expat
     fribidi

pkgs/linux-support/pkgs/opensnitch-ebpf/default.nix

@@ -2,7 +2,6 @@
   lib,
   kernel,
   stdenv,
-  clang-tools,
   llvmPackages,
   elfutils,
   flex,

pkgs/stripJavaArchivesHook/default.nix

@@ -1,6 +1,6 @@
-{ makeSetupHook, strip-nondeterminism }:
+{ makeSetupHook, perlPackages }:
 
 makeSetupHook {
   name = "strip-java-archives-hook";
-  propagatedBuildInputs = [ strip-nondeterminism ];
+  propagatedBuildInputs = [ perlPackages.strip-nondeterminism ];
 } ./strip-java-archives.sh

pkgs/vlang/default.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  glfw,
+  glfw3,
   freetype,
   openssl,
   makeWrapper,
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [
-    glfw
+    glfw3
     freetype
     openssl
     sqlite

pkgs/writers/scripts.nix

@@ -1182,7 +1182,7 @@ rec {
       ])
       // {
         interpreter =
-          if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then
+          if pythonPackages != pkgs.pypy2.pkgs || pythonPackages != pkgs.pypy3.pkgs then
             if libraries == [ ] then
               python.interpreter
             else if (lib.isFunction libraries) then
@@ -1220,7 +1220,7 @@ rec {
 
     :::
   */
-  writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages;
+  writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2.pkgs buildPackages.pypy2.pkgs;
 
   /**
     writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin)
@@ -1274,7 +1274,7 @@ rec {
 
     :::
   */
-  writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages;
+  writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3.pkgs buildPackages.pypy3.pkgs;
 
   /**
     writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin)

python/cpython/2.7/default.nix

@@ -14,7 +14,6 @@
   sqlite,
   tcl ? null,
   tk ? null,
-  tclPackages,
   libx11 ? null,
   x11Support ? false,
   zlib,
@@ -326,8 +325,8 @@ stdenv.mkDerivation (
 
     setupHook = python-setup-hook sitePackages;
 
-    postPatch = lib.optionalString (x11Support && ((tclPackages.tix or null) != null)) ''
-      substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
+    postPatch = lib.optionalString (x11Support && ((tcl.pkgs.tix or null) != null)) ''
+      substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tcl.pkgs.tix}/lib'"
     '';
 
     postInstall = ''

python/pkgs/lxml/default.nix

@@ -9,7 +9,7 @@
   setuptools,
 
   # native dependencies
-  xcodebuild,
+  xcbuild,
   pkgsBuildHost,
   pkgsHostTarget,
 }:
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     cython
     setuptools
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   # required for build time dependency check
   nativeBuildInputs = [

python/pypy/default.nix

@@ -17,7 +17,6 @@
   expat,
   tcl,
   tk,
-  tclPackages ? { },
   libx11,
   gdbm,
   db,
@@ -177,9 +176,9 @@ stdenv.mkDerivation rec {
     substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \
       --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
 
-    ${lib.optionalString (tclPackages ? tix) ''
+    ${lib.optionalString (tcl.pkgs ? tix) ''
       substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \
-        --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
+        --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tcl.pkgs.tix}/lib'"
     ''}
   '';