editres: 1.0.8 -> 1.0.9 and refactor; xorg.editres: alias to editres

relevant changes:
- switch to gitlab source

pkgs/by-name/ed/editres/package.nix

@@ -1,40 +1,70 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   pkg-config,
-  libXt,
-  libXaw,
-  libXres,
-  utilmacros,
+  util-macros,
+  autoreconfHook,
+  wrapWithXFileSearchPathHook,
+  libx11,
+  libxaw,
+  libxkbfile,
+  libxmu,
+  libxres,
+  libxt,
+  xorgproto,
+  nix-update-script,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "editres";
-  version = "1.0.8";
+  version = "1.0.9";
 
-  src = fetchurl {
-    url = "mirror://xorg/individual/app/editres-${version}.tar.gz";
-    sha256 = "sha256-LVbWB3vHZ6+n4DD+ssNy/mvok/7EApoj9FodVZ/YRq4=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "editres";
+    tag = "editres-${finalAttrs.version}";
+    hash = "sha256-fdp6j8zS8mtzHpG9js9c8iIt1vsKsqGG9MdkpLh8UB0=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libXt
-    libXaw
-    libXres
-    utilmacros
-  ];
-
-  configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ];
+  strictDeps = true;
 
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
-    homepage = "https://cgit.freedesktop.org/xorg/app/editres/";
+  nativeBuildInputs = [
+    pkg-config
+    util-macros
+    autoreconfHook
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    libx11
+    libxaw
+    libxkbfile
+    libxmu
+    libxres
+    libxt
+    xorgproto
+  ];
+
+  installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=editres-(.*)" ]; };
+
+  meta = {
     description = "Dynamic resource editor for X Toolkit applications";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    longDescription = ''
+      Editres is a tool that allows users and application developers to view the full widget
+      hierarchy of any Xt Toolkit application that speaks the Editres protocol. In addition, editres
+      will help the user construct resource specifications, allow the user to apply the resource
+      to the application and view the results dynamically. Once the user is happy with a resource
+      specification editres will append the resource string to the user's X Resources file.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/editres";
+    license = lib.licenses.mitOpenGroup;
     mainProgram = "editres";
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/servers/x11/xorg/default.nix

@@ -4,6 +4,7 @@
   appres,
   bdftopcf,
   bitmap,
+  editres,
   font-adobe-100dpi,
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
@@ -157,6 +158,7 @@ self: with self; {
     appres
     bdftopcf
     bitmap
+    editres
     gccmakedep
     ico
     imake
@@ -304,54 +306,6 @@ self: with self; {
   xorgdocs = xorg-docs;
   xorgsgmldoctools = xorg-sgml-doctools;
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  editres = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libxkbfile,
-      libX11,
-      libXaw,
-      libXmu,
-      xorgproto,
-      libXt,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "editres";
-      version = "1.0.9";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/editres-1.0.9.tar.xz";
-        sha256 = "1imk7mgdc3q9lf058xisajij374x8r31ynvqmwbs9khfdxx3zz6d";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libxkbfile
-        libX11
-        libXaw
-        libXmu
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fonttosfnt = callPackage (
     {

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

@@ -335,6 +335,7 @@ print OUT <<EOF;
   appres,
   bdftopcf,
   bitmap,
+  editres,
   font-adobe-100dpi,
   font-adobe-75dpi,
   font-adobe-utopia-100dpi,
@@ -488,6 +489,7 @@ self: with self; {
     appres
     bdftopcf
     bitmap
+    editres
     gccmakedep
     ico
     imake

pkgs/servers/x11/xorg/overrides.nix

@@ -113,13 +113,6 @@ self: super:
       )
   ) { };
 
-  editres = super.editres.overrideAttrs (attrs: {
-    hardeningDisable = [ "format" ];
-    meta = attrs.meta // {
-      mainProgram = "editres";
-    };
-  });
-
   fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: {
     meta = attrs.meta // {
       license = lib.licenses.mit;

pkgs/servers/x11/xorg/tarballs.list

@@ -1,4 +1,3 @@
-mirror://xorg/individual/app/editres-1.0.9.tar.xz
 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz