diff --git a/pkgs/by-name/g-/g-wrap/package.nix b/pkgs/by-name/g-/g-wrap/package.nix
index 83028d8fb2e2482..a14c4bb45b45576 100644
--- a/pkgs/by-name/g-/g-wrap/package.nix
+++ b/pkgs/by-name/g-/g-wrap/package.nix
@@ -1,19 +1,39 @@
-{ fetchurl, lib, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
-
-stdenv.mkDerivation rec {
+{
+  lib,
+  fetchurl,
+  glib,
+  guile,
+  guile-lib,
+  libffi,
+  pkg-config,
+  stdenv,
+  # Boolean flags
+  glibSupport ? lib.meta.availableOn stdenv.hostPlatform glib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "g-wrap";
   version = "1.9.15";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
+    url = "mirror://savannah/g-wrap/g-wrap-${finalAttrs.version}.tar.gz";
+    hash = "sha256-D/bicA50tFcyNyb3wlUaRm2LpEM5cF9nkte1MxRcYCo=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-
-  # Note: Glib support is optional, but it's quite useful (e.g., it's used by
-  # Guile-GNOME).
-  buildInputs = [ guile glib guile-lib ];
+  nativeBuildInputs =
+    [
+      guile
+      pkg-config
+    ];
+
+  buildInputs =
+    [
+      guile
+      guile-lib
+    ]
+    # Note: Glib support is optional, but it's quite useful (e.g., it's used by
+    # Guile-GNOME).
+    ++ lib.optionals glibSupport [ glib ];
 
   propagatedBuildInputs = [ libffi ];
 
@@ -21,17 +41,19 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://www.nongnu.org/g-wrap/";
     description = "Wrapper generator for Guile";
-    mainProgram = "g-wrap-config";
     longDescription = ''
       G-Wrap is a tool (and Guile library) for generating function wrappers for
       inter-language calls.  It currently only supports generating Guile
       wrappers for C functions.
     '';
-    homepage = "https://www.nongnu.org/g-wrap/";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ vyp ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl2Plus;
+    mainProgram = "g-wrap-config";
+    maintainers = with lib.maintainers; [ vyp ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/gu/guile-aspell/package.nix b/pkgs/by-name/gu/guile-aspell/package.nix
index cf5e51e2540b775..1b398e9cae1d908 100644
--- a/pkgs/by-name/gu/guile-aspell/package.nix
+++ b/pkgs/by-name/gu/guile-aspell/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, guile
-, autoreconfHook
-, pkg-config
-, aspell
-, texinfo
+{
+  lib,
+  aspell,
+  autoreconfHook,
+  fetchFromGitHub,
+  guile,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,28 +20,29 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CvLECZLwf4MujAQCL3I81O5xFvq6ezVhV0BjbqI3mR0=";
   };
 
-  strictDeps = true;
+  outputs = [
+    "out"
+    "info"
+  ];
 
   nativeBuildInputs = [
-    guile
     autoreconfHook
+    guile
     pkg-config
     texinfo
   ];
 
-  buildInputs = [
-    guile
-  ];
+  buildInputs = [ guile ];
 
-  propagatedBuildInputs = [
-    aspell
-  ];
+  propagatedBuildInputs = [ aspell ];
 
-  meta = with lib; {
-    description = "Guile bindings for the aspell library";
+  strictDeps = true;
+
+  meta = {
     homepage = "https://github.com/spk121/guile-aspell";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ snowflake ];
-    platforms = guile.meta.platforms;
+    description = "Guile bindings for the aspell library";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ snowflake ];
+    inherit (guile.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix
index 3a8c9be42998f75..77faa6c80580888 100644
--- a/pkgs/by-name/gu/guile-avahi/package.nix
+++ b/pkgs/by-name/gu/guile-avahi/package.nix
@@ -1,41 +1,55 @@
-{ stdenv
-, lib
-, fetchgit
-, avahi
-, gmp
-, buildPackages
-, autoreconfHook
-, pkg-config
-, texinfo
-, guile
+{
+  lib,
+  autoreconfHook,
+  avahi,
+  buildPackages,
+  fetchFromSavannah,
+  gmp,
+  guile,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-avahi";
   version = "0.4.1";
 
-  src = fetchgit {
-    url = "git://git.sv.gnu.org/guile-avahi.git";
-    rev = "v${version}";
+  src = fetchFromSavannah {
+    repo = "guile-avahi";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Yr+OiqaGv6DgsjxSoc4sAjy4OO/D+Q50vdSTPEeIrV8=";
   };
 
-  strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
+
   buildInputs = [ guile ];
-  propagatedBuildInputs = [ avahi gmp ];
 
-  doCheck = true;
+  propagatedBuildInputs = [
+    avahi
+    gmp
+  ];
+
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-unused-function";
 
-  meta = with lib; {
-    description = "Bindings to Avahi for GNU Guile";
+  strictDeps = true;
+
+  doCheck = true;
+
+  meta = {
     homepage = "https://www.nongnu.org/guile-avahi/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ foo-dogsquared ];
-    platforms = guile.meta.platforms;
+    description = "Bindings to Avahi for GNU Guile";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ foo-dogsquared ];
+    inherit (guile.meta) platforms;
   };
-}
-
+})
diff --git a/pkgs/by-name/gu/guile-cairo/package.nix b/pkgs/by-name/gu/guile-cairo/package.nix
index 3ed308de46b1e1e..181a984906a8980 100644
--- a/pkgs/by-name/gu/guile-cairo/package.nix
+++ b/pkgs/by-name/gu/guile-cairo/package.nix
@@ -1,37 +1,48 @@
-{ lib
-, stdenv
-, fetchurl
-, cairo
-, expat
-, guile
-, guile-lib
-, pkg-config
+{
+  lib,
+  autoreconfHook,
+  cairo,
+  expat,
+  fetchFromSavannah,
+  guile,
+  guile-lib,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-cairo";
   version = "1.11.2";
 
-  src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs=";
+  src = fetchFromSavannah {
+    repo = "guile-cairo";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-fPK5sMHnqmj/2BcY16uy7IUO/aSsWVwnSplZowCEdZA=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
+    guile
     pkg-config
+    texinfo
   ];
+
   buildInputs = [
     cairo
     expat
     guile
   ];
 
+  nativeCheckInputs = [ guile-lib ];
+
+  doCheck = true; # Cannot find unit-test module from guile-lib
+
   enableParallelBuilding = true;
 
-  doCheck = false; # Cannot find unit-test module from guile-lib
-  nativeCheckInputs = [ guile-lib ];
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.nongnu.org/guile-cairo/";
     description = "Cairo bindings for GNU Guile";
     longDescription = ''
@@ -43,8 +54,8 @@ stdenv.mkDerivation rec {
       maintained graphics library with all of the benefits of Scheme: memory
       management, exceptions, macros, and a dynamic programming environment.
     '';
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ vyp ];
-    platforms = guile.meta.platforms;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ vyp ];
+    inherit (guile.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/gu/guile-chickadee/package.nix b/pkgs/by-name/gu/guile-chickadee/package.nix
index aa34a0d36df9b4c..15c93c406350ff7 100644
--- a/pkgs/by-name/gu/guile-chickadee/package.nix
+++ b/pkgs/by-name/gu/guile-chickadee/package.nix
@@ -1,23 +1,24 @@
-{ lib
-, stdenv
-, fetchurl
-, autoreconfHook
-, makeWrapper
-, testers
-, guile
-, pkg-config
-, texinfo
-, freetype
-, libjpeg_turbo
-, libpng
-, libvorbis
-, mpg123
-, openal
-, readline
-, guile-opengl
-, guile-sdl2
-, guile-chickadee
+{
+  lib,
+  autoreconfHook,
+  fetchurl,
+  freetype,
+  guile,
+  guile-opengl,
+  guile-sdl2,
+  libjpeg_turbo,
+  libpng,
+  libvorbis,
+  makeWrapper,
+  mpg123,
+  openal,
+  pkg-config,
+  readline,
+  stdenv,
+  testers,
+  texinfo,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "guile-chickadee";
   version = "0.10.0";
@@ -27,12 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Ey9TtuWaGlHG2cYYwqJIt2RX7XNUW28OGl/kuPUCD3U=";
   };
 
-  strictDeps = true;
-
   nativeBuildInputs = [
-    makeWrapper
     autoreconfHook
     guile
+    makeWrapper
     pkg-config
     texinfo
   ];
@@ -55,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
+  strictDeps = true;
+
   postInstall = ''
     wrapProgram $out/bin/chickadee \
       --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
@@ -62,19 +63,19 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru.tests.version = testers.testVersion {
-    package = guile-chickadee;
+    package = finalAttrs.finalPackage;
     command = "chickadee -v";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
-    description = "Game development toolkit for Guile Scheme with SDL2 and OpenGL";
+  meta = {
     homepage = "https://dthompson.us/projects/chickadee.html";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ chito ];
+    description = "Game development toolkit for Guile Scheme with SDL2 and OpenGL";
+    license = lib.licenses.asl20;
     mainProgram = "chickadee";
-    platforms = guile.meta.platforms;
+    maintainers = with lib.maintainers; [ chito ] ;
+    inherit (guile.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/gu/guile-commonmark/package.nix b/pkgs/by-name/gu/guile-commonmark/package.nix
index c103635d37afe3d..f4406ce2ca08ee5 100644
--- a/pkgs/by-name/gu/guile-commonmark/package.nix
+++ b/pkgs/by-name/gu/guile-commonmark/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, guile
-, pkg-config
-, texinfo
+{
+  lib,
+  autoreconfHook,
+  fetchFromGitHub,
+  guile,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
 stdenv.mkDerivation {
@@ -20,25 +21,25 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     autoreconfHook
+    guile
     pkg-config
     texinfo # for makeinfo
   ];
-  buildInputs = [
-    guile
-  ];
+
+  buildInputs = [ guile ];
+
+  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
   # https://github.com/OrangeShark/guile-commonmark/issues/20
   doCheck = false;
 
-  makeFlags = [
-    "GUILE_AUTO_COMPILE=0"
-  ];
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/OrangeShark/guile-commonmark";
     description = "Implementation of CommonMark for Guile";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = guile.meta.platforms;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    inherit (guile.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-config/package.nix b/pkgs/by-name/gu/guile-config/package.nix
index d0fe7be0c87ed9b..3ba0c662c902c4d 100644
--- a/pkgs/by-name/gu/guile-config/package.nix
+++ b/pkgs/by-name/gu/guile-config/package.nix
@@ -1,17 +1,30 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, texinfo, guile }:
+{
+  lib,
+  autoreconfHook,
+  fetchFromGitLab,
+  guile,
+  pkg-config,
+  stdenv,
+  texinfo,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-config";
   version = "0.5.1";
 
   src = fetchFromGitLab {
     owner = "a-sassmannshausen";
     repo = "guile-config";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-n4ukGCyIx5G1ITfKSqS6FGJ6dnDBsyxXKSFNi81E4Gg=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ];
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
 
   buildInputs = [ guile ];
 
@@ -19,11 +32,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
-    description = "Configuration management library for GNU Guile";
+  strictDeps = true;
+
+  meta = {
     homepage = "https://gitlab.com/a-sassmannshausen/guile-config";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = guile.meta.platforms;
+    description = "Configuration management library for GNU Guile";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sikmir ];
+    inherit (guile.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix
index c5b9b07a61244a0..a1687f39da1265f 100644
--- a/pkgs/by-name/gu/guile-fibers/package.nix
+++ b/pkgs/by-name/gu/guile-fibers/package.nix
@@ -1,26 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, guile
-, libevent
-, pkg-config
-, texinfo
+{
+  lib,
+  autoreconfHook,
+  fetchFromGitHub,
+  guile,
+  libevent,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-fibers";
   version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "wingo";
     repo = "fibers";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM=";
   };
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     autoreconfHook
     guile
@@ -33,15 +32,15 @@ stdenv.mkDerivation rec {
     libevent
   ];
 
-  makeFlags = [
-    "GUILE_AUTO_COMPILE=0"
-  ];
+  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+
+  strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/wingo/fibers";
     description = "Concurrent ML-like concurrency for Guile";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ vyp ];
-    platforms = guile.meta.platforms;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ vyp ];
+    inherit (guile.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/gu/guile-gcrypt/package.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix
index 3b6aa220ae923fa..5ecc381d779522f 100644
--- a/pkgs/by-name/gu/guile-gcrypt/package.nix
+++ b/pkgs/by-name/gu/guile-gcrypt/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, guile
-, libgcrypt
-, autoreconfHook
-, pkg-config
-, texinfo
+{
+  lib,
+  autoreconfHook,
+  fetchFromGitea,
+  guile,
+  libgcrypt,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,27 +21,32 @@ stdenv.mkDerivation rec {
     hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ=";
   };
 
-  strictDeps = true;
   nativeBuildInputs = [
-    autoreconfHook guile libgcrypt pkg-config texinfo
-  ];
-  buildInputs = [
+    autoreconfHook
     guile
-  ];
-  propagatedBuildInputs = [
     libgcrypt
+    pkg-config
+    texinfo
   ];
+
+  buildInputs = [ guile ];
+
+  propagatedBuildInputs = [ libgcrypt ];
+
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+
   doCheck = true;
 
+  strictDeps = true;
+
   # In procedure bytevector-u8-ref: Argument 2 out of range
   dontStrip = stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
-    description = "Bindings to Libgcrypt for GNU Guile";
+  meta = {
     homepage = "https://notabug.org/cwebber/guile-gcrypt";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ethancedwards8 ];
-    platforms = guile.meta.platforms;
+    description = "Bindings to Libgcrypt for GNU Guile";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    inherit (guile.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix
index f092238929bf44e..27f066ea13a3d9c 100644
--- a/pkgs/by-name/gu/guile-git/package.nix
+++ b/pkgs/by-name/gu/guile-git/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, guile
-, libgit2
-, scheme-bytestructures
-, autoreconfHook
-, pkg-config
-, texinfo
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  guile,
+  libgit2,
+  scheme-bytestructures,
+  autoreconfHook,
+  pkg-config,
+  texinfo,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,13 +23,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   nativeBuildInputs = [
-    autoreconfHook guile pkg-config texinfo
-  ];
-  buildInputs = [
+    autoreconfHook
     guile
+    pkg-config
+    texinfo
   ];
+  buildInputs = [ guile ];
   propagatedBuildInputs = [
-    libgit2 scheme-bytestructures
+    libgit2
+    scheme-bytestructures
   ];
   doCheck = !stdenv.hostPlatform.isDarwin;
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
diff --git a/pkgs/by-name/gu/guile-gnutls/package.nix b/pkgs/by-name/gu/guile-gnutls/package.nix
index 952d2558d050227..12598655e574a19 100644
--- a/pkgs/by-name/gu/guile-gnutls/package.nix
+++ b/pkgs/by-name/gu/guile-gnutls/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchurl
-, buildPackages
-, gnutls
-, guile
-, libtool
-, pkg-config
-, texinfo
+{
+  lib,
+  stdenv,
+  fetchurl,
+  buildPackages,
+  gnutls,
+  guile,
+  libtool,
+  pkg-config,
+  texinfo,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,9 +21,7 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  depsBuildBuild = [
-    buildPackages.stdenv.cc
-  ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [
     gnutls
diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix
index 4175b9c5d79b424..a6c3733502644c9 100644
--- a/pkgs/by-name/gu/guile-goblins/package.nix
+++ b/pkgs/by-name/gu/guile-goblins/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchurl
-, guile
-, guile-fibers
-, guile-gcrypt
-, guile-gnutls
-, texinfo
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchurl,
+  guile,
+  guile-fibers,
+  guile-gcrypt,
+  guile-gnutls,
+  texinfo,
+  pkg-config,
 }:
 stdenv.mkDerivation rec {
   pname = "guile-goblins";
@@ -18,8 +19,17 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = [ guile pkg-config texinfo ];
-  buildInputs = [ guile guile-fibers guile-gcrypt guile-gnutls ];
+  nativeBuildInputs = [
+    guile
+    pkg-config
+    texinfo
+  ];
+  buildInputs = [
+    guile
+    guile-fibers
+    guile-gcrypt
+    guile-gnutls
+  ];
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
   # tests hang on darwin, and fail randomly on aarch64-linux on ofborg
diff --git a/pkgs/by-name/gu/guile-hall/package.nix b/pkgs/by-name/gu/guile-hall/package.nix
index 3c57fb4da8ce03f..4a7ae9bef5d6f5f 100644
--- a/pkgs/by-name/gu/guile-hall/package.nix
+++ b/pkgs/by-name/gu/guile-hall/package.nix
@@ -1,5 +1,14 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config
-, texinfo, makeWrapper, guile, guile-config }:
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  texinfo,
+  makeWrapper,
+  guile,
+  guile-config,
+}:
 
 stdenv.mkDerivation rec {
   pname = "guile-hall";
@@ -12,9 +21,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-TUCN8kW44X6iGbSJURurcz/Tc2eCH1xgmXH1sMOMOXs=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo makeWrapper ];
-
-  buildInputs = [ guile guile-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    texinfo
+    makeWrapper
+  ];
+
+  buildInputs = [
+    guile
+    guile-config
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/gu/guile-json/package.nix b/pkgs/by-name/gu/guile-json/package.nix
index cb34e22e62379e5..27f2aa7931e79d9 100644
--- a/pkgs/by-name/gu/guile-json/package.nix
+++ b/pkgs/by-name/gu/guile-json/package.nix
@@ -1,35 +1,43 @@
-{ lib
-, stdenv
-, fetchurl
-, guile
-, texinfo
-, pkg-config
+{
+  lib,
+  autoreconfHook,
+  fetchFromSavannah,
+  guile,
+  pkg-config,
+  stdenv,
+  texinfo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guile-json";
   version = "4.7.3";
 
-  src = fetchurl {
-    url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz";
-    sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g=";
+  src = fetchFromSavannah {
+    repo = "guile-json";
+    rev = finalAttrs.version;
+    hash = "sha256-BrhEJQsPn2sP4AF06WI9skRoWGKGA+xdKdShLTuqcCo=";
   };
 
-  strictDeps = true;
   nativeBuildInputs = [
-    guile pkg-config texinfo
-  ];
-  buildInputs = [
+    autoreconfHook
     guile
+    pkg-config
+    texinfo
   ];
-  doCheck = true;
+
+  buildInputs = [ guile ];
+
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
-  meta = with lib; {
+  doCheck = true;
+
+  strictDeps = true;
+
+  meta = {
     description = "JSON Bindings for GNU Guile";
     homepage = "https://savannah.nongnu.org/projects/guile-json";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ethancedwards8 ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix
index 5143c959ccd5f7f..b886ec04580da06 100644
--- a/pkgs/by-name/gu/guile-lib/package.nix
+++ b/pkgs/by-name/gu/guile-lib/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchurl
-, autoreconfHook
-, guile
-, pkg-config
-, texinfo
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  guile,
+  pkg-config,
+  texinfo,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,7 +54,10 @@ stdenv.mkDerivation rec {
       for Guile".
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vyp foo-dogsquared ];
+    maintainers = with maintainers; [
+      vyp
+      foo-dogsquared
+    ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-lzlib/package.nix b/pkgs/by-name/gu/guile-lzlib/package.nix
index a465849470b04d5..faefb69bc265198 100644
--- a/pkgs/by-name/gu/guile-lzlib/package.nix
+++ b/pkgs/by-name/gu/guile-lzlib/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchurl
-, autoreconfHook
-, guile
-, pkg-config
-, texinfo
-, lzlib
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  guile,
+  pkg-config,
+  texinfo,
+  lzlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,8 +20,16 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
-  propagatedBuildInputs = [ guile lzlib ];
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
+  propagatedBuildInputs = [
+    guile
+    lzlib
+  ];
 
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix
index 9f7b941f068f8e0..2149ed422759371 100644
--- a/pkgs/by-name/gu/guile-lzma/package.nix
+++ b/pkgs/by-name/gu/guile-lzma/package.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchurl
-, xz
-, pkg-config
-, guile
-, scheme-bytestructures
+{
+  stdenv,
+  lib,
+  fetchurl,
+  xz,
+  pkg-config,
+  guile,
+  scheme-bytestructures,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/gu/guile-ncurses/package.nix b/pkgs/by-name/gu/guile-ncurses/package.nix
index e20da1d9f98c7e2..e73f916cda2bb07 100644
--- a/pkgs/by-name/gu/guile-ncurses/package.nix
+++ b/pkgs/by-name/gu/guile-ncurses/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchurl
-, pkg-config
-, guile
-, libffi
-, ncurses
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  guile,
+  libffi,
+  ncurses,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,18 +17,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     guile
     libffi
     ncurses
   ];
 
-  configureFlags = [
-    "--with-gnu-filesystem-hierarchy"
-  ];
+  configureFlags = [ "--with-gnu-filesystem-hierarchy" ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/gu/guile-opengl/package.nix b/pkgs/by-name/gu/guile-opengl/package.nix
index efbb23cf71f5fe1..f0ffc658634699d 100644
--- a/pkgs/by-name/gu/guile-opengl/package.nix
+++ b/pkgs/by-name/gu/guile-opengl/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchurl
-, guile
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchurl,
+  guile,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/gu/guile-quickcheck/package.nix b/pkgs/by-name/gu/guile-quickcheck/package.nix
index 2c3c0f9c4b9bf31..2c77b99ca18dd2c 100644
--- a/pkgs/by-name/gu/guile-quickcheck/package.nix
+++ b/pkgs/by-name/gu/guile-quickcheck/package.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
-, fetchurl
-, pkg-config
-, guile
+{
+  stdenv,
+  lib,
+  fetchurl,
+  pkg-config,
+  guile,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = [ guile pkg-config ];
+  nativeBuildInputs = [
+    guile
+    pkg-config
+  ];
   buildInputs = [ guile ];
 
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/gu/guile-reader/package.nix b/pkgs/by-name/gu/guile-reader/package.nix
index 2a9d20f9aefacf3..80773d957dc6ca1 100644
--- a/pkgs/by-name/gu/guile-reader/package.nix
+++ b/pkgs/by-name/gu/guile-reader/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchurl
-, gperf
-, guile
-, guile-lib
-, libffi
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gperf,
+  guile,
+  guile-lib,
+  libffi,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,9 +18,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gperf
     guile
@@ -27,11 +26,13 @@ stdenv.mkDerivation rec {
     libffi
   ];
 
-  env = {
-    GUILE_SITE = "${guile-lib}/${guile.siteDir}";
-  } // lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
+  env =
+    {
+      GUILE_SITE = "${guile-lib}/${guile.siteDir}";
+    }
+    // lib.optionalAttrs stdenv.cc.isClang {
+      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+    };
 
   configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ];
 
@@ -39,13 +40,13 @@ stdenv.mkDerivation rec {
     homepage = "https://www.nongnu.org/guile-reader/";
     description = "Simple framework for building readers for GNU Guile";
     longDescription = ''
-       Guile-Reader is a simple framework for building readers for GNU Guile.
+      Guile-Reader is a simple framework for building readers for GNU Guile.
 
-       The idea is to make it easy to build procedures that extend Guile's read
-       procedure. Readers supporting various syntax variants can easily be
-       written, possibly by re-using existing "token readers" of a standard
-       Scheme readers. For example, it is used to implement Skribilo's
-       R5RS-derived document syntax.
+      The idea is to make it easy to build procedures that extend Guile's read
+      procedure. Readers supporting various syntax variants can easily be
+      written, possibly by re-using existing "token readers" of a standard
+      Scheme readers. For example, it is used to implement Skribilo's
+      R5RS-derived document syntax.
     '';
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix
index 83879b26f7db657..2acd42f7833f923 100644
--- a/pkgs/by-name/gu/guile-sdl/package.nix
+++ b/pkgs/by-name/gu/guile-sdl/package.nix
@@ -43,9 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
         paths = finalAttrs.buildInputs;
       };
     in
-    [
-      "SDLMINUSI=-I${sdl-env}/include/SDL"
-    ];
+    [ "SDLMINUSI=-I${sdl-env}/include/SDL" ];
 
   strictDeps = true;
 
@@ -53,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/guile-sdl/";
     description = "Guile bindings for SDL";
     license = lib.licenses.gpl3Plus;
-    maintainers = lib.teams.sdl.members
-                  ++ (with lib.maintainers; [ ]);
+    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]);
     inherit (guile.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/gu/guile-sdl2/package.nix b/pkgs/by-name/gu/guile-sdl2/package.nix
index 0ae8424b597dcf3..aa051a7ae071ab3 100644
--- a/pkgs/by-name/gu/guile-sdl2/package.nix
+++ b/pkgs/by-name/gu/guile-sdl2/package.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchurl
-, SDL2
-, SDL2_image
-, SDL2_mixer
-, SDL2_ttf
-, guile
-, libtool
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchurl,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
+  SDL2_ttf,
+  guile,
+  libtool,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,15 +39,16 @@ stdenv.mkDerivation rec {
     "--with-libsdl2-ttf-prefix=${SDL2_ttf}"
   ];
 
-  makeFlags = [
-    "GUILE_AUTO_COMPILE=0"
-  ];
+  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
   meta = with lib; {
     homepage = "https://dthompson.us/projects/guile-sdl2.html";
     description = "Bindings to SDL2 for GNU Guile";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ seppeljordan vyp ];
+    maintainers = with maintainers; [
+      seppeljordan
+      vyp
+    ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix
index 3d4713f709666cf..aad799d81798e87 100644
--- a/pkgs/by-name/gu/guile-semver/package.nix
+++ b/pkgs/by-name/gu/guile-semver/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchurl
-, autoreconfHook
-, pkg-config
-, texinfo
-, guile
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  pkg-config,
+  texinfo,
+  guile,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +18,18 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
   buildInputs = [ guile ];
 
   doCheck = true;
 
   meta = with lib; {
-    description =
-      "A GNU Guile library implementing Semantic Versioning 2.0.0";
+    description = "A GNU Guile library implementing Semantic Versioning 2.0.0";
     homepage = "https://ngyro.com/software/guile-semver.html";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ foo-dogsquared ];
diff --git a/pkgs/by-name/gu/guile-sjson/package.nix b/pkgs/by-name/gu/guile-sjson/package.nix
index 8f9b49f95e0620c..d18f8b28811c5d2 100644
--- a/pkgs/by-name/gu/guile-sjson/package.nix
+++ b/pkgs/by-name/gu/guile-sjson/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, autoreconfHook
-, guile
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  guile,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,9 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [
-    guile
-  ];
+  buildInputs = [ guile ];
 
   meta = with lib; {
     description = "S-expression based json reader/writer for Guile";
diff --git a/pkgs/by-name/gu/guile-ssh/package.nix b/pkgs/by-name/gu/guile-ssh/package.nix
index ad3a8c5474428e6..1150624c925a8ae 100644
--- a/pkgs/by-name/gu/guile-ssh/package.nix
+++ b/pkgs/by-name/gu/guile-ssh/package.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, guile
-, libssh
-, autoreconfHook
-, pkg-config
-, texinfo
-, which
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  guile,
+  libssh,
+  autoreconfHook,
+  pkg-config,
+  texinfo,
+  which,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,13 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
     which
   ];
 
-  buildInputs = [
-    guile
-  ];
+  buildInputs = [ guile ];
 
-  propagatedBuildInputs = [
-    libssh
-  ];
+  propagatedBuildInputs = [ libssh ];
 
   enableParallelBuilding = true;
 
@@ -60,7 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Bindings to Libssh for GNU Guile";
     homepage = "https://github.com/artyom-poptsov/guile-ssh";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ];
+    maintainers = with maintainers; [
+      ethancedwards8
+      foo-dogsquared
+    ];
     platforms = guile.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/gu/guile-xcb/package.nix b/pkgs/by-name/gu/guile-xcb/package.nix
index 2102e395d0b3034..0f6e162b97dc6e2 100644
--- a/pkgs/by-name/gu/guile-xcb/package.nix
+++ b/pkgs/by-name/gu/guile-xcb/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, guile
-, pkg-config
-, texinfo
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  guile,
+  pkg-config,
+  texinfo,
 }:
 
 stdenv.mkDerivation rec {
@@ -32,9 +33,7 @@ stdenv.mkDerivation rec {
     "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
   ];
 
-  makeFlags = [
-    "GUILE_AUTO_COMPILE=0"
-  ];
+  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
   meta = with lib; {
     homepage = "https://github.com/mwitmer/guile-xcb";
diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix
index a7559ebfbba5824..852e7b0df5661a8 100644
--- a/pkgs/by-name/gu/guile-zlib/package.nix
+++ b/pkgs/by-name/gu/guile-zlib/package.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitea
-, autoreconfHook
-, pkg-config
-, guile
-, texinfo
-, zlib
+{
+  stdenv,
+  lib,
+  fetchFromGitea,
+  autoreconfHook,
+  pkg-config,
+  guile,
+  texinfo,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,12 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
   buildInputs = [ guile ];
   propagatedBuildInputs = [ zlib ];
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
@@ -29,8 +35,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with lib; {
-    description =
-      "Guile-zlib is a GNU Guile library providing bindings to zlib";
+    description = "Guile-zlib is a GNU Guile library providing bindings to zlib";
     homepage = "https://notabug.org/guile-zlib/guile-zlib";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ foo-dogsquared ];
diff --git a/pkgs/by-name/gu/guile-zstd/package.nix b/pkgs/by-name/gu/guile-zstd/package.nix
index 2c0f9b8d0425bd9..4b35092837633c4 100644
--- a/pkgs/by-name/gu/guile-zstd/package.nix
+++ b/pkgs/by-name/gu/guile-zstd/package.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitea
-, autoreconfHook
-, pkg-config
-, guile
-, texinfo
-, zstd
+{
+  stdenv,
+  lib,
+  fetchFromGitea,
+  autoreconfHook,
+  pkg-config,
+  guile,
+  texinfo,
+  zstd,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,12 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
-  nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
+  nativeBuildInputs = [
+    autoreconfHook
+    guile
+    pkg-config
+    texinfo
+  ];
   buildInputs = [ guile ];
   propagatedBuildInputs = [ zstd ];
   makeFlags = [ "GUILE_AUTO_COMPILE=0" ];