From 49e9431c2af188836ba25b8127e281bdc06313b2 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 2 Sep 2022 17:29:04 +0800 Subject: [PATCH 1/4] guile-gcrypt: add make flags and tests --- pkgs/development/guile-modules/guile-gcrypt/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 73152fb9d2c3..7c7e11e3d2b1 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,6 +29,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; From d4cf2b811e3c4af5a44803d7a6ca3b5192f4c073 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:51:14 +0800 Subject: [PATCH 2/4] guile-json: add make flags and tests --- pkgs/development/guile-modules/guile-json/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index da15ca2d6ac4..c4d15503cb81 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -15,19 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-xTSaI4D2fIphOps698mNITJdRDAjNp5vdhs2bpaUaEM="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site/json%' json/Makefile; - sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache/json%' json/Makefile; - ''; - nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; meta = with lib; { description = "JSON Bindings for GNU Guile"; From 826fd7598402596f27548877f5689d2e83a5c783 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:51:39 +0800 Subject: [PATCH 3/4] guile-git: add make flags and tests --- pkgs/development/guile-modules/guile-git/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 0b3dfefcbe8c..5487116b53af 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -34,9 +29,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; + # Skipping proxy tests since it requires network access. + postConfigure = '' + sed -i -e '94i (test-skip 1)' ./tests/proxy.scm + ''; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; From 10c02745ab7f9d324107ecfd557905677fd04322 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 4 Oct 2022 19:52:01 +0800 Subject: [PATCH 4/4] scheme-bytestructures: add make flags and tests --- .../scheme-modules/scheme-bytestructures/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 602b0d86f44b..1cbbdf0bf29d 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; - postConfigure = '' - sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; - sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -29,6 +24,9 @@ stdenv.mkDerivation rec { guile ]; + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures";