gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xs{et,etroot,m,tdcmap}: refactor and move to pkgs/by-name from xorg namespace (#436066)

Browse Source
This commit is contained in:
jopejoe1
2025-09-10 11:23:01 +02:00
committed by GitHub
parent 1a71fe0853 10a2efa52e
commit 7b3f27918d
8 changed files with 263 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/xs/xset/package.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
libx11,
libxext,
libxmu,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xset";
version = "1.2.5";
src = fetchurl {
url = "mirror://xorg/individual/app/xset-${finalAttrs.version}.tar.xz";
hash = "sha256-n2ktVWNbOGLNY2M7EiKodoDsKDx6jo7W3WmKMUf3Xi8=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libx11
libxext
libxmu
];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/app/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "User preference utility for X servers";
homepage = "https://gitlab.freedesktop.org/xorg/app/xset";
license = lib.licenses.mitOpenGroup;
mainProgram = "xset";
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/xs/xsetroot/package.nix
+53
View File
@@ -0,0 +1,53 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
xbitmaps,
libx11,
libxcursor,
libxmu,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xsetroot";
version = "1.1.3";
src = fetchurl {
url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz";
hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
xbitmaps
libx11
libxcursor
libxmu
];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/app/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "Root window parameter setting utility for X";
homepage = "https://gitlab.freedesktop.org/xorg/app/xsetroot";
license = lib.licenses.mitOpenGroup;
mainProgram = "xsetroot";
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/xs/xsm/package.nix
+88
View File
@@ -0,0 +1,88 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
wrapWithXFileSearchPathHook,
xorgproto,
libice,
libsm,
libx11,
libxaw,
libxt,
makeBinaryWrapper,
writeScript,
# run time dependencies
iceauth,
smproxy,
twm,
xterm,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xsm";
version = "1.0.6";
src = fetchurl {
url = "mirror://xorg/individual/app/xsm-${finalAttrs.version}.tar.xz";
hash = "sha256-t0zHdMYGDDdZL2ipDb0xsPKmL7FOVidpQ095vihKY84=";
};
strictDeps = true;
nativeBuildInputs = [
pkg-config
wrapWithXFileSearchPathHook
makeBinaryWrapper
];
buildInputs = [
xorgproto
libice
libsm
libx11
libxaw
libxt
];
installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
postInstall = ''
wrapProgram $out/bin/xsm \
--prefix PATH : ${
lib.makeBinPath [
iceauth
smproxy
twm
xterm
]
}
'';
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/app/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "X Session Manager";
longDescription = ''
A session is a group of X applications, each of which has a particular state. xsm allows you
to create arbitrary sessions - for example, you might have a "light" session, a "development"
session, or an "xterminal" session. Each session can have its own set of applications. Within
a session, you can perform a "checkpoint" to save application state, or a "shutdown" to save
state and exit the session. When you log back in to the system, you can load a specific
session, and you can delete sessions you no longer want to keep.
'';
homepage = "https://gitlab.freedesktop.org/xorg/app/xsm";
license = lib.licenses.mitOpenGroup;
mainProgram = "xsm";
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/xs/xstdcmap/package.nix
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
xorgproto,
libx11,
libxmu,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xstdcmap";
version = "1.0.5";
src = fetchurl {
url = "mirror://xorg/individual/app/xstdcmap-${finalAttrs.version}.tar.xz";
hash = "sha256-NlhH43k5hJnsmtmimcxHoNbn/rqVRt/U5bQiIEtawYA=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libx11
libxmu
];
passthru = {
updateScript = writeScript "update-${finalAttrs.pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts
version="$(list-directory-versions --pname ${finalAttrs.pname} \
--url https://xorg.freedesktop.org/releases/individual/app/ \
| sort -V | tail -n1)"
update-source-version ${finalAttrs.pname} "$version"
'';
};
meta = {
description = "X standard colormap utility";
longDescription = ''
The xstdcmap utility can be used to selectively define standard colormap properties.
It is intended to be run from a user's X startup script to create standard colormap
definitions in order to facilitate sharing of scarce colormap resources among clients using
PseudoColor visuals.
'';
homepage = "https://gitlab.freedesktop.org/xorg/app/xstdcmap";
license = lib.licenses.mitOpenGroup;
mainProgram = "xstdcmap";
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/servers/x11/xorg/default.nix
+8 -170
View File
@@ -94,6 +94,10 @@
xprop,
xrandr,
xrefresh,
xset,
xsetroot,
xsm,
xstdcmap,
xtrans,
xvinfo,
xwininfo,
@@ -148,6 +152,10 @@ self: with self; {
xprop
xrandr
xrefresh
xset
xsetroot
xsm
xstdcmap
xtrans
xvinfo
xwininfo
@@ -4938,176 +4946,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xset = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libX11,
libXext,
libXmu,
xorgproto,
libXxf86misc,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xset";
version = "1.2.5";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/xset-1.2.5.tar.xz";
sha256 = "0bsyyx3k32k9vpb8x3ks7hlfr03nm0i14fv3cg6n4f2vcdajsscz";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXext
libXmu
xorgproto
libXxf86misc
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xsetroot = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libX11,
xbitmaps,
libXcursor,
libXmu,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xsetroot";
version = "1.1.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz";
sha256 = "1l9qcv4mldj70slnmfg56nv7yh9j9ca1x795bl26whmlkrdb90b0";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
xbitmaps
libXcursor
libXmu
xorgproto
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xsm = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libICE,
libSM,
libX11,
libXaw,
xorgproto,
libXt,
wrapWithXFileSearchPathHook,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xsm";
version = "1.0.6";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/xsm-1.0.6.tar.xz";
sha256 = "1kk398lbwyag8dljfmjfn4psdwmh66yhvab85xckf306qrscfk5p";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [
pkg-config
wrapWithXFileSearchPathHook
];
buildInputs = [
libICE
libSM
libX11
libXaw
xorgproto
libXt
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xstdcmap = callPackage (
{
stdenv,
pkg-config,
fetchurl,
libX11,
libXmu,
xorgproto,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xstdcmap";
version = "1.0.5";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz";
sha256 = "1061b95j08mlwpadyilmpbzfgmm08z69k8nrkbn9k11rg7ilfn1n";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libX11
libXmu
xorgproto
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xtrap = callPackage (
{
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+8
View File
@@ -411,6 +411,10 @@ print OUT <<EOF;
xprop,
xrandr,
xrefresh,
xset,
xsetroot,
xsm,
xstdcmap,
xtrans,
xvinfo,
xwininfo,
@@ -465,6 +469,10 @@ self: with self; {
xprop
xrandr
xrefresh
xset
xsetroot
xsm
xstdcmap
xtrans
xvinfo
xwininfo
pkgs/servers/x11/xorg/overrides.nix
-4
View File
@@ -938,10 +938,6 @@ self: super:
};
});
xset = addMainProgram super.xset { };
xsetroot = addMainProgram super.xsetroot { };
xsm = addMainProgram super.xsm { };
xstdcmap = addMainProgram super.xstdcmap { };
xwd = addMainProgram super.xwd { };
# convert Type1 vector fonts to OpenType fonts
pkgs/servers/x11/xorg/tarballs.list
-4
View File
@@ -22,10 +22,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
mirror://xorg/individual/app/xload-1.2.0.tar.xz
mirror://xorg/individual/app/xpr-1.2.0.tar.xz
mirror://xorg/individual/app/xrdb-1.2.2.tar.xz
mirror://xorg/individual/app/xset-1.2.5.tar.xz
mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz
mirror://xorg/individual/app/xsm-1.0.6.tar.xz
mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz
mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
mirror://xorg/individual/app/xwd-1.0.9.tar.xz
mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz