From 6dd26b15efd08c9ab6c5b15a8fa61620345be59c Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 18 Sep 2024 09:40:12 -0300
Subject: [PATCH 1/3] sng: migrate to by-name

---
 .../graphics/sng/default.nix => by-name/sn/sng/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/graphics/sng/default.nix => by-name/sn/sng/package.nix} (100%)

diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/by-name/sn/sng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/sng/default.nix
rename to pkgs/by-name/sn/sng/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97bf23bde3e6..eb4a65ecea65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12473,8 +12473,6 @@ with pkgs;
 
   snet = callPackage ../tools/networking/snet { };
 
-  sng = callPackage ../tools/graphics/sng { };
-
   snmpcheck = callPackage ../tools/networking/snmpcheck { };
 
   snobol4 = callPackage ../development/interpreters/snobol4 { };

From 5a1faea6755447f787e3d84a526c1fec41e88d54 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 18 Sep 2024 09:54:19 -0300
Subject: [PATCH 2/3] sng: refactor

- nixfmt-rfc-style
- finalAttrs
- strictDeps
- no nested with
---
 pkgs/by-name/sn/sng/package.nix | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/sn/sng/package.nix b/pkgs/by-name/sn/sng/package.nix
index a8db32128a5e..886ff566509c 100644
--- a/pkgs/by-name/sn/sng/package.nix
+++ b/pkgs/by-name/sn/sng/package.nix
@@ -1,26 +1,32 @@
-{ lib, stdenv, fetchurl, libpng, netpbm }:
+{
+  lib,
+  fetchurl,
+  libpng,
+  netpbm,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sng";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sng/sng-${version}.tar.gz";
-    sha256 = "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i";
+    url = "mirror://sourceforge/sng/sng-${finalAttrs.version}.tar.gz";
+    hash = "sha256-EZxVhwwdG9xl996dvGKSnMsMMBwvt59332P11HfzRhk=";
   };
 
   buildInputs = [ libpng ];
 
-  configureFlags = [
-    "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt"
-  ];
+  configureFlags = [ "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" ];
 
-  meta = with lib; {
-    description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form";
+  strictDeps = true;
+
+  meta = {
     homepage = "https://sng.sourceforge.net/";
-    license = licenses.zlib;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.unix;
+    description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form";
+    license = lib.licenses.zlib;
     mainProgram = "sng";
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From a4b3d54e409f5f7b34a1fce4527f51e0f4e8af4b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 18 Sep 2024 11:01:20 -0300
Subject: [PATCH 3/3] sng: 1.1.0 -> 1.1.1

---
 pkgs/by-name/sn/sng/package.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/sng/package.nix b/pkgs/by-name/sn/sng/package.nix
index 886ff566509c..544a07165d2d 100644
--- a/pkgs/by-name/sn/sng/package.nix
+++ b/pkgs/by-name/sn/sng/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  asciidoctor,
   fetchurl,
   libpng,
   netpbm,
@@ -8,16 +9,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sng";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sng/sng-${finalAttrs.version}.tar.gz";
-    hash = "sha256-EZxVhwwdG9xl996dvGKSnMsMMBwvt59332P11HfzRhk=";
+    url = "mirror://sourceforge/sng/sng-${finalAttrs.version}.tar.xz";
+    hash = "sha256-yb37gPWhfbGquTN7rtZKjr6lwN34KRXGiHuM+4fs5h4=";
   };
 
+  nativeBuildInputs = [ asciidoctor ];
+
   buildInputs = [ libpng ];
 
-  configureFlags = [ "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" ];
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  makeFlags = [
+    "prefix=$(out)"
+    "MANDIR=$(outputMan)/share/man"
+    "RGBTXT=${netpbm.out}/share/netpbm/misc/rgb.txt"
+  ];
 
   strictDeps = true;
 
@@ -26,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form";
     license = lib.licenses.zlib;
     mainProgram = "sng";
-    maintainers = with lib.maintainers; [ dezgeg ];
+    maintainers = with lib.maintainers; [
+      dezgeg
+      AndersonTorres
+    ];
     platforms = lib.platforms.unix;
   };
 })