colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #189421 from foo-dogsquared/update-guile-gcrypt

Browse Source
This commit is contained in:
Sandro 2022-10-09 12:22:27 +02:00 committed by GitHub
commit 63a937e54b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/guile-modules/guile-gcrypt/default.nix
View File

@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; 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 = [ nativeBuildInputs = [
autoreconfHook pkg-config texinfo autoreconfHook pkg-config texinfo
]; ];
@ -34,6 +29,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
libgcrypt libgcrypt
]; ];
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Bindings to Libgcrypt for GNU Guile"; description = "Bindings to Libgcrypt for GNU Guile";

12
pkgs/development/guile-modules/guile-git/default.nix
View File

@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; 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 = [ nativeBuildInputs = [
autoreconfHook pkg-config texinfo autoreconfHook pkg-config texinfo
]; ];
@ -34,9 +29,16 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
libgit2 scheme-bytestructures libgit2 scheme-bytestructures
]; ];
doCheck = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
enableParallelBuilding = true; enableParallelBuilding = true;
# Skipping proxy tests since it requires network access.
postConfigure = ''
sed -i -e '94i (test-skip 1)' ./tests/proxy.scm
'';
meta = with lib; { meta = with lib; {
description = "Bindings to Libgit2 for GNU Guile"; description = "Bindings to Libgit2 for GNU Guile";
homepage = "https://gitlab.com/guile-git/guile-git"; homepage = "https://gitlab.com/guile-git/guile-git";

9
pkgs/development/guile-modules/guile-json/default.nix
View File

@ -15,19 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; 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 = [ nativeBuildInputs = [
pkg-config texinfo pkg-config texinfo
]; ];
buildInputs = [ buildInputs = [
guile guile
]; ];
doCheck = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
meta = with lib; { meta = with lib; {
description = "JSON Bindings for GNU Guile"; description = "JSON Bindings for GNU Guile";

8
pkgs/development/scheme-modules/scheme-bytestructures/default.nix
View File

@ -17,11 +17,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; 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 = [ nativeBuildInputs = [
autoreconfHook pkg-config autoreconfHook pkg-config
]; ];
@ -29,6 +24,9 @@ stdenv.mkDerivation rec {
guile guile
]; ];
doCheck = true;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
meta = with lib; { meta = with lib; {
description = "Structured access to bytevector contents"; description = "Structured access to bytevector contents";
homepage = "https://github.com/TaylanUB/scheme-bytestructures"; homepage = "https://github.com/TaylanUB/scheme-bytestructures";