From 7e1ddd1a4a3668a51845741cd368e22c1bc91cc5 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 19 Aug 2024 12:57:32 -0300
Subject: [PATCH 1/2] guile-sqlite3: migrate to by-name

---
 .../default.nix => by-name/gu/guile-sqlite3/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/guile-modules/guile-sqlite3/default.nix => by-name/gu/guile-sqlite3/package.nix} (100%)

diff --git a/pkgs/development/guile-modules/guile-sqlite3/default.nix b/pkgs/by-name/gu/guile-sqlite3/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-sqlite3/default.nix
rename to pkgs/by-name/gu/guile-sqlite3/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9775674b0f0f425..ae6579c500f60a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17203,8 +17203,6 @@ with pkgs;
 
   guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
 
-  guile-sqlite3 = callPackage ../development/guile-modules/guile-sqlite3 { };
-
   guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb {

From fa36e4bd1aecfa5c70969786623ab27c091698b0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 19 Aug 2024 13:15:06 -0300
Subject: [PATCH 2/2] guile-sqlite3: adopt and rewrite

- nixfmt-rfc-style
- finalAttrs
- no nested with
---
 pkgs/by-name/gu/guile-sqlite3/package.nix | 47 +++++++++++++----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/gu/guile-sqlite3/package.nix b/pkgs/by-name/gu/guile-sqlite3/package.nix
index 4b309f7fbe5deba..5c90db74be3a6a5 100644
--- a/pkgs/by-name/gu/guile-sqlite3/package.nix
+++ b/pkgs/by-name/gu/guile-sqlite3/package.nix
@@ -1,46 +1,51 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, guile
-, autoreconfHook
-, pkg-config
-, texinfo
-, sqlite
+{
+  lib,
+  autoreconfHook,
+  fetchFromGitea,
+  guile,
+  pkg-config,
+  sqlite,
+  stdenv,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-sqlite3";
   version = "0.1.3";
 
   src = fetchFromGitea {
     domain = "notabug.org";
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM=";
+    owner = "guile-sqlite3";
+    repo = "guile-sqlite3";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM=";
   };
 
-  strictDeps = true;
   nativeBuildInputs = [
     autoreconfHook
     guile
     pkg-config
     texinfo
   ];
+
   buildInputs = [
     guile
     sqlite
   ];
 
-  doCheck = true;
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+
+  strictDeps = true;
+
+  doCheck = true;
+
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    description = "Guile bindings for the SQLite3 database engine";
+  meta = {
     homepage = "https://notabug.org/guile-sqlite3/guile-sqlite3";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ miangraham ];
-    platforms = guile.meta.platforms;
+    description = "Guile bindings for the SQLite3 database engine";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    inherit (guile.meta) platforms;
   };
-}
+})