slock, slstatus: migrate to by-name and minor improvements (#432977)

Author: SuperSandro2000

pkgs/misc/screensavers/slock/default.nix renamed to pkgs/by-name/sl/slock/package.nix

@@ -1,16 +1,17 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchzip,
   writeText,
   xorgproto,
   libX11,
   libXext,
   libXrandr,
   libxcrypt,
-  # default header can be obtained from
-  # https://git.suckless.org/slock/tree/config.def.h
-  conf ? null,
+  config,
+  conf ? config.slock.conf or null,
+  patches ? config.slock.patches or [ ],
+  extraLibs ? config.slock.extraLibs or [ ],
   # update script dependencies
   gitUpdater,
 }:
@@ -19,9 +20,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "slock";
   version = "1.5";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://dl.suckless.org/tools/slock-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0=";
+    hash = "sha256-nAAbyH4jixmwes9esrWRnHFw3mythKfqWu2+DRdlmx0=";
   };
 
   buildInputs = [
@@ -30,7 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXrandr
     libxcrypt
-  ];
+  ]
+  ++ extraLibs;
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -40,23 +42,25 @@ stdenv.mkDerivation (finalAttrs: {
     cp ${writeText "config.def.h" conf} config.def.h
   '';
 
+  inherit patches;
+
   makeFlags = [ "CC:=$(CC)" ];
 
   passthru.updateScript = gitUpdater {
     url = "git://git.suckless.org/slock";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tools.suckless.org/slock";
     description = "Simple X display locker";
     mainProgram = "slock";
     longDescription = ''
       Simple X display locker. This is the simplest X screen locker.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       qusic
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })

pkgs/applications/misc/slstatus/default.nix renamed to pkgs/by-name/sl/slstatus/package.nix

@@ -1,25 +1,26 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchzip,
   pkg-config,
   writeText,
   libX11,
   libXau,
   libXdmcp,
-  conf ? null,
-  patches ? [ ],
+  config,
+  conf ? config.slstatus.conf or null,
+  patches ? config.slstatus.patches or [ ],
+  extraLibs ? config.slstatus.extraLibs or [ ],
   # update script dependencies
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "slstatus";
   version = "1.1";
 
-  src = fetchgit {
-    url = "https://git.suckless.org/slstatus";
-    rev = version;
+  src = fetchzip {
+    url = "https://dl.suckless.org/tools/slstatus-${finalAttrs.version}.tar.gz";
     hash = "sha256-MRDovZpQsvnLEvsbJNBzprkzQQ4nIs1T9BLT+tSGta8=";
   };
 
@@ -40,21 +41,22 @@ stdenv.mkDerivation rec {
     libX11
     libXau
     libXdmcp
-  ];
+  ]
+  ++ extraLibs;
 
   installFlags = [ "PREFIX=$(out)" ];
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tools.suckless.org/slstatus/";
     description = "Status monitor for window managers that use WM_NAME like dwm";
-    license = licenses.isc;
-    maintainers = with maintainers; [
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [
       oxzi
       qusic
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "slstatus";
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -4249,10 +4249,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  slstatus = callPackage ../applications/misc/slstatus {
-    conf = config.slstatus.conf or null;
-  };
-
   smpq = callPackage ../by-name/sm/smpq/package.nix {
     stormlib = stormlib.overrideAttrs (old: {
       version = "9.22";
@@ -15893,10 +15889,6 @@ with pkgs;
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
-  slock = callPackage ../misc/screensavers/slock {
-    conf = config.slock.conf or null;
-  };
-
   snscrape = with python3Packages; toPythonApplication snscrape;
 
   sourceAndTags = callPackage ../misc/source-and-tags {