From fc27f3d77c5ff0530aae79825752017583721ef0 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 13 Nov 2025 17:07:42 +0100 Subject: [PATCH 1/2] guile-ncurses: fix build, use ncurses abi v5 --- pkgs/by-name/gu/guile-ncurses/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/guile-ncurses/package.nix b/pkgs/by-name/gu/guile-ncurses/package.nix index 1c0504966ec9..08b57ded2069 100644 --- a/pkgs/by-name/gu/guile-ncurses/package.nix +++ b/pkgs/by-name/gu/guile-ncurses/package.nix @@ -5,7 +5,7 @@ pkg-config, guile, libffi, - ncurses, + ncurses5, }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile libffi - ncurses + ncurses5 ]; configureFlags = [ From 2846bc9d25d64c654a185acc45fec511ae833674 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 13 Nov 2025 17:14:55 +0100 Subject: [PATCH 2/2] guile-ncurses: clean up --- pkgs/by-name/gu/guile-ncurses/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gu/guile-ncurses/package.nix b/pkgs/by-name/gu/guile-ncurses/package.nix index 08b57ded2069..8500092e533a 100644 --- a/pkgs/by-name/gu/guile-ncurses/package.nix +++ b/pkgs/by-name/gu/guile-ncurses/package.nix @@ -8,12 +8,12 @@ ncurses5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-ncurses"; version = "3.1"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://gnu/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM="; }; @@ -37,14 +37,13 @@ stdenv.mkDerivation rec { postFixup = '' for f in $out/${guile.siteDir}/ncurses/**.scm; do \ substituteInPlace $f \ - --replace "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \ + --replace-fail "libguile-ncurses" "$out/lib/guile/${guile.effectiveVersion}/libguile-ncurses"; \ done ''; - # XXX: 1 of 65 tests failed. - doCheck = false; + doCheck = true; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/guile-ncurses/"; description = "Scheme interface to the NCurses libraries"; mainProgram = "guile-ncurses-shell"; @@ -54,8 +53,8 @@ stdenv.mkDerivation rec { interface functionality is built on the ncurses libraries: curses, form, panel, and menu. ''; - license = licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; platforms = guile.meta.platforms; }; -} +})