From cf4d3465af0db6384010587a78b67e7e9af36d1c Mon Sep 17 00:00:00 2001 From: Jasi Date: Wed, 23 Jul 2025 18:18:07 -0700 Subject: [PATCH 1/2] c-intro-and-ref: add normalcea as maintainer --- pkgs/by-name/c-/c-intro-and-ref/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix index bdc17ec47a98..18d99ff9cabb 100644 --- a/pkgs/by-name/c-/c-intro-and-ref/package.nix +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/c-intro-and-ref/"; changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}"; license = lib.licenses.fdl13Plus; - maintainers = with lib.maintainers; [ rc-zb ]; + maintainers = with lib.maintainers; [ + normalcea + rc-zb + ]; platforms = lib.platforms.all; }; }) From 0a5db94540156c27b105bfc3e212c7ecd9f845ba Mon Sep 17 00:00:00 2001 From: Jasi Date: Thu, 24 Jul 2025 13:22:04 -0700 Subject: [PATCH 2/2] =?UTF-8?q?c-intro-and-ref:=200-unstable-2025-03-09=20?= =?UTF-8?q?=E2=86=92=200.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uses the GNU archive mirror instead of cgit snapshot and reworks package code to match the same outputs as the previous version. Removes `passthru.updateScript` and `meta.changelog` --- pkgs/by-name/c-/c-intro-and-ref/package.nix | 70 ++++++++++----------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix index 18d99ff9cabb..184bf3caa5c4 100644 --- a/pkgs/by-name/c-/c-intro-and-ref/package.nix +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -1,58 +1,53 @@ { lib, stdenv, - fetchFromSavannah, + fetchurl, + autoreconfHook, texinfo, texliveBasic, - ghostscript, - unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "c-intro-and-ref"; - version = "0-unstable-2025-03-09"; + version = "0.1"; - src = fetchFromSavannah { - repo = "c-intro-and-ref"; - rev = "11723f5d07331708985dfd3eb9b05163dde990e5"; - hash = "sha256-quTeOQKTX/Aq78vMJPsjVQyisADzWm9mtLE1HoJByl4="; + src = fetchurl { + url = "mirror://gnu/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-45mtnlyz2RuYUk4Jza+lZGGBxezpiRS/v70xx1iKxEQ="; }; nativeBuildInputs = [ + autoreconfHook texinfo - ghostscript texliveBasic ]; - buildFlags = [ - "c.info" - "c.dvi" - "c.pdf" - # FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm - # "c.doc" - "c.html" - "c.html.d" - "c.txt" - ]; - - installPhase = '' - runHook preInstall - dst_info=$out/share/info - dst_doc=$out/share/doc/c-intro-and-ref - mkdir -p $dst_info - mkdir -p $dst_doc - - cp -prv -t $dst_info \ - c.info c.info-* - cp -prv -t $dst_doc \ - c.dvi \ - c.pdf \ - c.html \ - c.html.d \ - c.txt - runHook postInstall + # Remove pre-built documentaton artifacts + postConfigure = '' + make clean ''; - passthru.updateScript = unstableGitUpdater { }; + buildFlags = [ + "c.dvi" + "c.html" + ]; + + # Build missing targets + postBuild = '' + makeinfo --html --no-split c.texi -o c.htm + makeinfo --plaintext c.texi -o c.txt + ''; + + # FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm + # Occurs when building "c.doc" + # makeinfo --docbook c.texi -o c.doc + + # Install missing targets + postInstall = '' + install -Dm644 c.htm $out/share/doc/c-intro-and-ref/c.html + install -Dm644 c.txt -t $out/share/doc/c-intro-and-ref/ + install -Dm644 c.html/* -t $out/share/doc/c-intro-and-ref/c.html.d/ + install -Dm644 c.dvi -t $out/share/doc/c-intro-and-ref/ + ''; meta = { description = "GNU C Language Intro and Reference Manual"; @@ -63,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { a reference manual. ''; homepage = "https://www.gnu.org/software/c-intro-and-ref/"; - changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}"; license = lib.licenses.fdl13Plus; maintainers = with lib.maintainers; [ normalcea