From f17dd885896d41b8d6e55ed9d19aed6a6f79054d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 22 Sep 2023 01:24:18 +0800 Subject: guile-lib: add foo-dogsquared as maintainer --- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 2678bcb2c05..23576729ac0 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { for Guile". ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = with maintainers; [ vyp foo-dogsquared ]; platforms = guile.meta.platforms; }; } -- cgit 1.4.1 From 08070c94d93c7570dc8cedf6fb8097a5eed7f4e9 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 22 Sep 2023 01:24:47 +0800 Subject: guile-lib: fix module installation in the output This should now make Guile recognize it as one of the module in its search path. --- pkgs/development/guile-modules/guile-lib/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 23576729ac0..75e45b00d4e 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , guile , pkg-config , texinfo @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { texinfo ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ + --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' + ''; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; doCheck = !stdenv.isDarwin; -- cgit 1.4.1 From dbaa365633dc13ee805930c124d3f8ae9d9da471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Sep 2023 22:46:28 +0000 Subject: guile-gnutls: 3.7.12 -> 4.0.0 --- pkgs/development/guile-modules/guile-gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index 8fe69b26840..91ffe90b043 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "guile-gnutls"; - version = "3.7.12"; + version = "4.0.0"; src = fetchurl { url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz"; - hash = "sha256-XTrxFXMJPeWfJYQVhy4sWxTMqd0lGosuwWQ9bpf+4zY="; + hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; }; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From 3cb477b7ee822314ff8f81a2ba4a39671ad69c25 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:18 +0200 Subject: guile-gcrypt: set strictDeps --- pkgs/development/guile-modules/guile-gcrypt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 2b4fd46ea27..ac5d373955f 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile libgcrypt pkg-config texinfo ]; buildInputs = [ guile -- cgit 1.4.1 From 506cb9e268a080d30be19d6af77ca35773ce053e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:25 +0200 Subject: guile-git: set strictDeps --- pkgs/development/guile-modules/guile-git/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 84d53b66e19..6afddd8d362 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile pkg-config texinfo ]; buildInputs = [ guile -- cgit 1.4.1 From c109adc5bf3be38552cd803c7dcf7d0b94956035 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:31 +0200 Subject: guile-gnutls: set strictDeps --- pkgs/development/guile-modules/guile-gnutls/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index 91ffe90b043..ae666077bf8 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ + guile + pkg-config + ]; buildInputs = [ gnutls -- cgit 1.4.1 From ac37aede471acc6cd37a9274f625e92380402d81 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:37 +0200 Subject: guile-json: set strictDeps --- pkgs/development/guile-modules/guile-json/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 81febc3171b..cb34e22e623 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; + strictDeps = true; nativeBuildInputs = [ - pkg-config texinfo + guile pkg-config texinfo ]; buildInputs = [ guile -- cgit 1.4.1 From 70d990743ba2e6aa92cb99809c5d14653b7d8713 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:44 +0200 Subject: guile-lib: set strictDeps --- pkgs/development/guile-modules/guile-lib/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 75e45b00d4e..8c38432e3e2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { hash = "sha256-5O87hF8SGILHwM8E+BocuP02DG9ktWuGjeVUYhT5BN4="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config ]; buildInputs = [ -- cgit 1.4.1 From df4e8fb47a4c6701eb8c0e132b4dedf0e4472fd7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Oct 2023 02:36:52 +0200 Subject: guile-sqlite3: set strictDeps --- pkgs/development/guile-modules/guile-sqlite3/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-sqlite3/default.nix b/pkgs/development/guile-modules/guile-sqlite3/default.nix index 430249f2c93..4b309f7fbe5 100644 --- a/pkgs/development/guile-modules/guile-sqlite3/default.nix +++ b/pkgs/development/guile-modules/guile-sqlite3/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config texinfo ]; -- cgit 1.4.1 From 4d2590533ed4cd748c904545422a7b00850fd62c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:58:25 +0200 Subject: guile-gnutls: fix cross --- pkgs/development/guile-modules/guile-gnutls/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index ae666077bf8..952d2558d05 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, buildPackages , gnutls , guile , libtool @@ -19,16 +20,21 @@ stdenv.mkDerivation rec { strictDeps = true; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + nativeBuildInputs = [ + gnutls guile + libtool + texinfo pkg-config ]; buildInputs = [ gnutls guile - libtool - texinfo ]; configureFlags = [ -- cgit 1.4.1 From 07b331e8339250bc59916416820dea282f897364 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:20:53 +0100 Subject: guile-reader: fix build with clang 16 --- pkgs/development/guile-modules/guile-reader/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/guile-modules') diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index edc6d73fffc..fcb6e8c7a8a 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { libffi ]; - env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + 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}" ]; -- cgit 1.4.1