diff options
| author | quantenzitrone <general@dev.quantenzitrone.eu> | 2026-01-23 15:56:11 +0100 |
|---|---|---|
| committer | quantenzitrone <general@dev.quantenzitrone.eu> | 2026-01-25 22:28:09 +0100 |
| commit | 7d8132a92cb220bdbff2a0f427ab17e4bec7b016 (patch) | |
| tree | 287bd27aedac87eefed1e8fc24910916dd090824 /pkgs/development/interpreters | |
| parent | treewide: remove all uses of 'with xorg;' in `pkgs` (diff) | |
| download | nixpkgs-7d8132a92cb220bdbff2a0f427ab17e4bec7b016.tar.gz | |
treewide: remove references to the xorg namespace in `pkgs` (automated)
this creates some eval errors that will be fixed in the next commit
done with the following script:
```fish
\#!/usr/bin/env fish
set packagesjson (nix eval --impure --json --expr '
let
lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
name: _:
if name == "lib" then
lib
else if name == "config" then
{ allowAliases = false; }
else
name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)
set one (grep '^ [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^ [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)
for arg in $one $two
set oname $arg
set nname (echo $packagesjson | jq -r .$oname)
if test $nname = null
echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
continue
end
echo $oname "->" $nname
# replace basic xorg.$name references
for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
# special cases
sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file
# replace
sd -F "xorg.$oname" "$nname" $file
# fixup function arguments
# prevent duplicate function args
if grep -E " ($oname|$nname),\$" $file >/dev/null
continue
end
if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg
if grep ' xorg,$' $file >/dev/null
sd ' xorg,$' " xorg,
$nname," $file
else if grep ' xorg ? .*,$' $file >/dev/null
sd 'xorg( ? .*),$' "xorg\$1,
$nname," $file
else
sd -F 'xorg,' "$nname,
xorg," $file
end
else # case there is no more xorg..* so we can just replace the function arg
sd 'xorg(| ? .*),.*$' "$nname," $file
end
end
end
nix fmt
```
Diffstat (limited to 'pkgs/development/interpreters')
5 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1ab41c655cad..5d6b0f3eb699 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -41,7 +41,7 @@ unixODBC, wrapGAppsHook3, wxGTK32, - xorg, + libx11, zlib, }: let @@ -59,7 +59,7 @@ let libGL libGLU wxGTK32 - xorg.libX11 + libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ef0ba19d8071..fe0375b5e35c 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -19,7 +19,7 @@ autoconf, automake, libtool, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - xorg.libX11 # SDl2 optional depend, for SDL_syswm.h + libx11 # SDl2 optional depend, for SDL_syswm.h libGLU libGL openal diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index e3ea4d9a6656..2fe0d4bedc31 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -18,7 +18,7 @@ libtheora, which, libtool, - xorg, + libx11, cmake, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libtool ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 # SDL2 optional depend, for SDL_syswm.h + libx11 # SDL2 optional depend, for SDL_syswm.h libGLU libGL ]; diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index ceb2cad30a71..a9c466b39ed2 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -11,18 +11,18 @@ cups gcc-unwrapped libGL - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXau - xorg.libXdamage - xorg.libXi - xorg.libXrender - xorg.libXrandr - xorg.libXcomposite - xorg.libXcursor - xorg.libXtst - xorg.libXScrnSaver + libsm + libice + libx11 + libxau + libxdamage + libxi + libxrender + libxrandr + libxcomposite + libxcursor + libxtst + libxscrnsaver ] ); } diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix index 4b7110bab413..4b31ae915d17 100644 --- a/pkgs/development/interpreters/python/manylinux/default.nix +++ b/pkgs/development/interpreters/python/manylinux/default.nix @@ -54,11 +54,11 @@ let "libutil.so.1" = glibc; "libpthread.so.0" = glibc; "libresolv.so.2" = glibc; - "libX11.so.6" = xorg.libX11; - "libXext.so.6" = xorg.libXext; - "libXrender.so.1" = xorg.libXrender; - "libICE.so.6" = xorg.libICE; - "libSM.so.6" = xorg.libSM; + "libX11.so.6" = libx11; + "libXext.so.6" = libxext; + "libXrender.so.1" = libxrender; + "libICE.so.6" = libice; + "libSM.so.6" = libsm; "libGL.so.1" = libGL; "libgobject-2.0.so.0" = glib; "libgthread-2.0.so.0" = glib; |
