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
```
This commit is contained in:
@@ -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
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user