diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-09 12:22:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 12:22:27 +0200 |
| commit | 63a937e54bfc2e5bfe4f027dc9423e095b562c66 (patch) | |
| tree | df5978397ecab2783d14f8f0c5462345f3223cb9 /pkgs/development/guile-modules | |
| parent | 53e18170b1a867857524e1923f9997644fe2d997 (diff) | |
| parent | 10c02745ab7f9d324107ecfd557905677fd04322 (diff) | |
Merge pull request #189421 from foo-dogsquared/update-guile-gcrypt
Diffstat (limited to 'pkgs/development/guile-modules')
| -rw-r--r-- | pkgs/development/guile-modules/guile-gcrypt/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/guile-modules/guile-git/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/guile-modules/guile-json/default.nix | 9 |
3 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 73152fb9d2c35..7c7e11e3d2b1d 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"; diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 0b3dfefcbe8c0..5487116b53afd 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"; diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 1698614c426fa..dee81f2baebde 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-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; }; - 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"; |