xlsatoms: refactor and migrate to pkgs/by-name from xorg namespace

pkgs/by-name/xl/xlsatoms/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxcb,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xlsatoms";
+  version = "1.1.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xlsatoms-${finalAttrs.version}.tar.xz";
+    hash = "sha256-9L+hX1bAZtMmpdWykmRnCPJbkkdQaEC5BHzSaH3Mcbc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libxcb ];
+
+  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 = "Utility to list interned atoms defined on X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xlsatoms";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "xlsatoms";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/servers/x11/xorg/default.nix

@@ -25,6 +25,7 @@
   xcmsdb,
   xdriinfo,
   xkeyboard-config,
+  xlsatoms,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -49,6 +50,7 @@ self: with self; {
     xbitmaps
     xcmsdb
     xdriinfo
+    xlsatoms
     xorgproto
     xtrans
     ;
@@ -6878,38 +6880,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xlsatoms = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxcb,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xlsatoms";
-      version = "1.1.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz";
-        sha256 = "1dviriynilkw0jwl0s2h8y95pwh8cxj95cnmllkd6rn0args3gzl";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ libxcb ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xlsclients = callPackage (
     {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

@@ -310,6 +310,7 @@ print OUT <<EOF;
   xcmsdb,
   xdriinfo,
   xkeyboard-config,
+  xlsatoms,
   xorg-cf-files,
   xorg-docs,
   xorgproto,
@@ -334,6 +335,7 @@ self: with self; {
     xbitmaps
     xcmsdb
     xdriinfo
+    xlsatoms
     xorgproto
     xtrans
     ;

pkgs/servers/x11/xorg/overrides.nix

@@ -1198,7 +1198,6 @@ self: super:
   xkbprint = addMainProgram super.xkbprint { };
   xkill = addMainProgram super.xkill { };
   xload = addMainProgram super.xload { };
-  xlsatoms = addMainProgram super.xlsatoms { };
   xlsclients = addMainProgram super.xlsclients { };
   xmag = addMainProgram super.xmag { };
   xmessage = addMainProgram super.xmessage { };

pkgs/servers/x11/xorg/tarballs.list

@@ -45,7 +45,6 @@ mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
 mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
 mirror://xorg/individual/app/xkill-1.0.6.tar.xz
 mirror://xorg/individual/app/xload-1.2.0.tar.xz
-mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz
 mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
 mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
 mirror://xorg/individual/app/xmag-1.0.8.tar.xz