Rework guile packages

pkgs/by-name/g-/g-wrap/package.nix

@@ -1,37 +1,59 @@
-{ 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 ];
 
  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
  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;
  };
-}
+})

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;
  };
 })

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;
  };
-}
-
+})

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;
  };
-}
+})

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,26 +54,28 @@ 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" \
  --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
  '';
 
  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;
  };
 })