From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kCmwDsX/X2BqPQAAgWs5BA (envelope-from ) for ; Sun, 28 Mar 2021 06:02:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YJmZCMX/X2D4LQAAB5/wlQ (envelope-from ) for ; Sun, 28 Mar 2021 04:02:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 72AB827BE2 for ; Sun, 28 Mar 2021 06:02:12 +0200 (CEST) Received: from localhost ([::1]:53570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQMct-0003o5-D4 for larch@yhetil.org; Sun, 28 Mar 2021 00:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQMck-0003ns-2B for guix-patches@gnu.org; Sun, 28 Mar 2021 00:02:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQMcj-00030I-PX for guix-patches@gnu.org; Sun, 28 Mar 2021 00:02:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQMcj-0002rc-Lj for guix-patches@gnu.org; Sun, 28 Mar 2021 00:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47274] Linphone Packages Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Mar 2021 04:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 47274@debbugs.gnu.org Received: via spool by 47274-submit@debbugs.gnu.org id=B47274.161690410510984 (code B ref 47274); Sun, 28 Mar 2021 04:02:01 +0000 Received: (at 47274) by debbugs.gnu.org; 28 Mar 2021 04:01:45 +0000 Received: from localhost ([127.0.0.1]:45276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMcS-0002r6-Pq for submit@debbugs.gnu.org; Sun, 28 Mar 2021 00:01:45 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:33723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQMcO-0002qp-DX for 47274@debbugs.gnu.org; Sun, 28 Mar 2021 00:01:43 -0400 Received: by mail-qk1-f180.google.com with SMTP id o5so9381408qkb.0 for <47274@debbugs.gnu.org>; Sat, 27 Mar 2021 21:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=WzxIPr55cL9iZuJOFmuak1RkezZGF+y42Hw86jAfBR8=; b=ne0j/LRc3pXLS0JbDhHIPJQKUfo51iORM/RazD8B8S9GOaCM1j7849pLv6k5zXM0a5 t2CEss8Jwx1kdTiWdL2IQBMGfrqFPaJGFB5Kyt67IFboXpgUCiKbdqi4pZLVzrlQ1uri C9QLjq8S/inLtZDqC9WZSr0rj72SB1uQORCmoYO0yJAHrPNVNPYzYCWtNBzYmJA4D27o Plj1hfpva2TfwtJ3IgS7ziwlWW25nOdkrhCDGjUGFSeA4O3APeRYjOL9xy0sdzTmVdgy dp9/53PNBTp/m5oZIFJUxmJedpr1NwEUW0f44qFGXfzKSn70cJ8nlDfmvRFv33GRfJTV 5+gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=WzxIPr55cL9iZuJOFmuak1RkezZGF+y42Hw86jAfBR8=; b=lLBpAt8Ncz91KQlENRnTHAlHx99OPUDccDBkX1q5B3EOuO0KVhweAep1C68oxycxz6 RIk+1DngXJP6KZyptOWaZbbY8RoVPgPkPtggVBSzF4yWUGzZZn+eofOD3/smXVq3TiPn 8UR2cT7Zr2EBnctwdbJGOX4zRph8E79wiP4eDCq9d5qfEVh8hyFQ6MkpE4JSm/OZ4eRp OGkI0I9od0mH+EHuDXO5RqevlPz4dnxZ1pKA1dVGzGBVfW++pX5PhCxm7k7Jxy+C/voE 31RUfbp0ehCqPT9K9SYmSfMd4TFvw4bm9JHtackWY7qekpRHwTkIm53BcKZoSuq40LAP VuRw== X-Gm-Message-State: AOAM530/ZMkGmOEMLEdFVz+AfktwA8CHTyaL/4lmdDtgCrYrinHHQJER AkExL0HHuo7/s/hGfmKi7SFM1vYscUU= X-Google-Smtp-Source: ABdhPJxVGVj5WfEzS1TO1J6tAVFkgJ2zYQ8scZyRG+3qSyoEU7ozIc3jn0oyjfmeWSA/RwqbqHwYCw== X-Received: by 2002:a05:620a:1206:: with SMTP id u6mr19155319qkj.173.1616904094558; Sat, 27 Mar 2021 21:01:34 -0700 (PDT) Received: from hurd (dsl-151-80.b2b2c.ca. [66.158.151.80]) by smtp.gmail.com with ESMTPSA id q2sm10279359qkq.59.2021.03.27.21.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Mar 2021 21:01:34 -0700 (PDT) From: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> <947239fd-4a1f-d340-dc5b-05089b50aedd@raghavgururajan.name> <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> Date: Sun, 28 Mar 2021 00:01:33 -0400 In-Reply-To: <66991ebb-4074-efab-4331-1ed195d55d26@raghavgururajan.name> (Raghav Gururajan's message of "Sun, 21 Mar 2021 21:48:59 -0400") Message-ID: <87czvkq63m.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616904132; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WzxIPr55cL9iZuJOFmuak1RkezZGF+y42Hw86jAfBR8=; b=EMdwiRCrk8G/sXryWi8ZkskK/+4Jpm40ulTjRLjtw25FIqVor11UhYY/qpVSmWYYlVmcF4 EziLGKUWz2uCgVIPg4JoU6Eyc2WuVYWMOL+I2BJcbcjyxlR8S6j2rnWNvr9z6hxWfkVutL 4XBHK+1CLrv1M3PC5E4nOlOLCnzS9Hxg+QUWDLaGI9Up1jNGihf00ZtMiNy0AURSXcWVqE H9luKjOYGysktK49c9/gDtzdWF+riOyqh4yefT69nHjXSqVGA7+kr/pECOdel1+Tc6ZaAZ LlWphHkPwmPouDRTvydCGwV0XsKvhk0BpnmjL5FJzMmj056XKX4ACDrwf/7lgw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616904132; a=rsa-sha256; cv=none; b=etEEKcn+cl/+/6F1AJyGAjNBOlMHZqa1Rv/JFC5oSiBVfcEwsK2X2V4T+IoprHI/5oMUea C93mHNWP9mq3i2WYuKL4Om26evoNDqf8HTejZaBEhjy2vod+I6Qw5DnVIKlSSvH/h4EmEV Ajw8E4OBdbX8EcNfN59O3cFzUt7Fisc0IJYthJqJojglJHZRHcz//vJn3G+7u5RozJ1C8t 7K7e+4b6+wHmD+qlBnMo9GaXHnrNgFeh9V/nAjfl9m9GLhelt2jqWXhmcejTjSiqttQynx MpHbBso9qRno/DlohTiXjf7K/fhRvFhIb2LWiTsKtuHsttSHK8eAAd5wTzWJlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="ne0j/LRc"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="ne0j/LRc"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 72AB827BE2 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4dn2Z7B/pNmk Hi! Raghav Gururajan writes: > [39. text/x-patch; 0038-gnu-Add-build.patch]... I had an old package of build from 2020 with a more fleshed out description, so I've pushed that version instead as commit 65719505b8. > From c6e27b74e1f90985513167b52cd0e0f9cc54aa73 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 18 Mar 2021 13:57:53 -0400 > Subject: [PATCH 39/53] gnu: Add libcutl. > > * gnu/packages/codesynthesis.scm (libcutl): New variable. > --- > gnu/packages/codesynthesis.scm | 44 ++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm > index 7cb9a427a5..a264692c19 100644 > --- a/gnu/packages/codesynthesis.scm > +++ b/gnu/packages/codesynthesis.scm > @@ -19,6 +19,8 @@ > > (define-module (gnu packages codesynthesis) > #:use-module (gnu packages) > + #:use-module (gnu packages pkg-config) pkg-config turned out not to be needed. > + #:use-module (gnu packages xml) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > #:use-module (guix download) > @@ -53,3 +55,45 @@ > implemented on top of GNU make.") > (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") > (license license:gpl2+))) > + > +(define-public libcutl > + (package > + (name "libcutl") > + (version "1.10.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://www.codesynthesis.com/download/libcu= tl/" > + (version-major+minor version) > + "/libcutl-" version ".tar.bz2")) > + (sha256 > + (base32 "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j")) > + (modules '((guix build utils))) > + (snippet > + `(begin > + ;; Remove bundled sources. > + (with-directory-excursion "cutl/details" > + (for-each delete-file-recursively > + ;; FIXME: Boost_RegEx isn't being detected. > + (list > + ;; "boost" > + "expat"))) > + #t)))) I removed the trailing #t. > + (build-system gnu-build-system) > + (arguments > + `(#:configure-flags > + (list > + "--disable-static" > + ;; "--with-external-boost" > + "--with-external-expat"))) > + (native-inputs > + `(("pkg-config" ,pkg-config))) Removed the native-inputs field. > + (inputs > + `(;; ("boost" ,boost) > + ("expat" ,expat))) > + (synopsis "C++ utility library") > + (description "@package{libcutl} is a C++ utility library. It contai= ns a > +collection of generic and independent components such as meta-programmin= g tests, > +smart pointers, containers, compiler building blocks, etc.") > + (home-page "https://www.codesynthesis.com/projects/libcutl/") > + (license license:expat))) > -- > 2.31.0 And pushed as ae479f1834. > From e3abe6dbfcbd6bfb352694fd5efcb9db9da6dce6 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 18 Mar 2021 14:00:13 -0400 > Subject: [PATCH 40/53] gnu: Add libxsd-frontend. > > * gnu/packages/codesynthesis.scm (libxsd-frontend): New variable. > --- > gnu/packages/codesynthesis.scm | 54 ++++++++++++++++++++++++++++++++++ > 1 file changed, 54 insertions(+) > > diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm > index a264692c19..f24fb760de 100644 > --- a/gnu/packages/codesynthesis.scm > +++ b/gnu/packages/codesynthesis.scm > @@ -97,3 +97,57 @@ collection of generic and independent components such = as meta-programming tests, > smart pointers, containers, compiler building blocks, etc.") > (home-page "https://www.codesynthesis.com/projects/libcutl/") > (license license:expat))) > + > +(define-public libxsd-frontend > + (package > + (name "libxsd-frontend") > + (version "2.0.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://www.codesynthesis.com/download/" > + "libxsd-frontend/" (version-major+minor versi= on) > + "/libxsd-frontend-" version ".tar.bz2")) > + (sha256 > + (base32 "1nmzchsvwvn66jpmcx18anzyl1a3l309x1ld4zllrg37ijc31fim"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:imported-modules > + ((guix build copy-build-system) > + ,@%gnu-build-system-modules) > + #:modules > + (((guix build copy-build-system) > + #:prefix copy:) > + (guix build gnu-build-system) > + (guix build utils)) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch > + (lambda _ > + (substitute* (find-files "." "\\.make$") > + (("build-0\\.3") > + (string-append (assoc-ref %build-inputs "build") "/inclu= de/build-0.3"))) > + #t)) I could turn this patch phase into a make flag: --8<---------------cut here---------------start------------->8--- #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils)) + #:make-flags (list (string-append "--include-dir=3D" + (assoc-ref %build-inputs "build") + "/include/")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* (find-files "." "\\.make$") - (("build-0\\.3") - (string-append (assoc-ref %build-inputs "build") - "/include/build-0.3"))))) (delete 'configure) (replace 'install --8<---------------cut here---------------end--------------->8--- > + (delete 'configure) > + (replace 'install > + (lambda args > + (apply (assoc-ref copy:%standard-phases 'install) > + #:install-plan > + '(("xsd-frontend" "include/xsd-frontend" > + #:include-regexp ("\\.?xx$")) > + ("xsd-frontend" "lib" > + #:include-regexp ("\\.so$"))) > + args)))))) > + (native-inputs > + `(("build" ,build) > + ("pkg-config" ,pkg-config))) Removed pkg-config, which was not needed. > + (inputs > + `(("libcutl" ,libcutl) > + ("libxerces-c" ,xerces-c))) > + (synopsis "XSD Front-end") > + (description "@package{libxsd-frontend} is a compiler frontend > for the W3C Replaced @package by @code, as the former is not valid Texinfo markup. > +XML Schema definition language. It includes a parser, semantic graph ty= pes and > +a traversal mechanism.") > + (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") > + (license license:gpl2+))) > -- > 2.31.0 And pushed as 111004cc58. > > From 2c1e262e549b928a624513e2c91b059b88b8e822 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 18 Mar 2021 14:33:34 -0400 > Subject: [PATCH 41/53] gnu: Add cli. > > * gnu/packages/codesynthesis.scm (cli): New variable. > --- > gnu/packages/codesynthesis.scm | 45 ++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm > index f24fb760de..b70e53cd7c 100644 > --- a/gnu/packages/codesynthesis.scm > +++ b/gnu/packages/codesynthesis.scm > @@ -151,3 +151,48 @@ XML Schema definition language. It includes a parse= r, semantic graph types and > a traversal mechanism.") > (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") > (license license:gpl2+))) > + > +(define-public cli > + (package > + (name "cli") > + (version "1.1.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://www.codesynthesis.com/download/" > + "cli/" (version-major+minor version) > + "/cli-" version ".tar.bz2")) > + (sha256 > + (base32 "0bg0nsai2q4h3mldpnj0jz4iy4svs0bcfvmq0v0c9cdyknny606g"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:make-flags > + (list > + (string-append "install_prefix=3D" (assoc-ref %outputs "out"))) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch > + (lambda _ > + (substitute* (find-files "." "\\.make$") > + (("build-0\\.3") > + (string-append (assoc-ref %build-inputs "build") > + "/include/build-0.3"))) I used the same --include-dir make flag trick here. > + (substitute* (find-files "." "\\.?xx$") > + (("add \\(typeid \\(type\\), \\*this\\);") > + "traverser_map::add (typeid (type), *this);") > + (("iterate_and_dispatch \\(s\\.names_begin \\(\\), s\\.na= mes_end \\(\\), d\\);") > + "edge_dispatcher::iterate_and_dispatch (s.names_begin ()= , s.names_end (), d);")) > + #t)) Dropped the #t, added a comment and added the prefix to the default regexp group bound to 'all', like this: + ;; Add the namespace prefix, to avoid errors such as "error: + ;; =E2=80=98iterate_and_dispatch=E2=80=99 was not declared in= this scope". + (substitute* (find-files "." "\\.?xx$") + (("add \\(typeid \\(type\\), \\*this\\);" all) + (string-append "traverser_map::" all)) + (("iterate_and_dispatch \\(s\\.names_begin.*;" all) + (string-append "edge_dispatcher::" all))))) > + (delete 'configure)))) > + (native-inputs > + `(("build" ,build) > + ("pkg-config" ,pkg-config))) Removed pkg-config, which was not needed. > + (inputs > + `(("libcutl" ,libcutl))) > + (synopsis "Command Line Interface (CLI) definition language") > + (description "@package{cli} is a domain-specific language (DSL) > for defining s/@package/@code/, as for the previous package. > +command line interfaces of C++ programs. It allows you to describe the = options > +that your program supports, their types, default values, and documentati= on.") > + (home-page "https://codesynthesis.com/projects/cli/") > + (license license:expat))) > -- > 2.31.0 And pushed as commit f649a0a557. > > From d46ed1d4bd1d85ad5c89d2c713f387714f152358 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 18 Mar 2021 15:51:18 -0400 > Subject: [PATCH 42/53] gnu: Add xsd. > > * gnu/packages/codesynthesis.scm (xsd): New variable. > --- > gnu/packages/codesynthesis.scm | 48 ++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/gnu/packages/codesynthesis.scm b/gnu/packages/codesynthesis.= scm > index b70e53cd7c..58f4fa9301 100644 > --- a/gnu/packages/codesynthesis.scm > +++ b/gnu/packages/codesynthesis.scm > @@ -19,6 +19,7 @@ > > (define-module (gnu packages codesynthesis) > #:use-module (gnu packages) > + #:use-module (gnu packages onc-rpc) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages xml) > #:use-module ((guix licenses) #:prefix license:) > @@ -196,3 +197,50 @@ command line interfaces of C++ programs. It allows = you to describe the options > that your program supports, their types, default values, and documentati= on.") > (home-page "https://codesynthesis.com/projects/cli/") > (license license:expat))) > + > +(define-public xsd > + (package > + (name "xsd") > + (version "4.0.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://www.codesynthesis.com/download/" > + "xsd/" (version-major+minor version) > + "/xsd-" version ".tar.bz2")) > + (sha256 > + (base32 "1hi9ppxd34np8ydv1h0vgc2qpdmgcd1cdzgk30aidv670xjg91fx"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:test-target "test" > + #:make-flags > + (list > + (string-append "install_prefix=3D" (assoc-ref %outputs "out"))) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch > + (lambda _ > + (substitute* (find-files "." "\\.make$") > + (("build-0\\.3") > + (string-append (assoc-ref %build-inputs "build") > + "/include/build-0.3"))) > + #t)) I added a doc output to hold the multi-megabyte documentation and examples and used the same make flag trick to allow finding build-0.3 files: + (outputs '("out" "doc")) ;3.8 MiB of doc and examples + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=3D" + (assoc-ref %build-inputs "build") + "/include/") + (string-append "install_prefix=3D" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file (string-append out "/share/doc/xsd") + (string-append doc "/share/doc/xsd-" + ,version))))) + (delete 'configure)))) > + (delete 'configure)))) > + (native-inputs > + `(("build" ,build) > + ("cli" ,cli) > + ("pkg-config" ,pkg-config))) Dropped pkg-config here as well. > + (inputs > + `(("libcutl" ,libcutl) > + ("libnsl" ,libnsl) > + ("libxsd-frontend" ,libxsd-frontend))) > + (propagated-inputs > + `(("libexpat" ,expat) > + ("libxerces-c" ,xerces-c))) I removed expat from propagated-inputs, as the xsd generated code default to using xerces-c. Someone wanting to use expat could add it manually. I've also added a comment like this, as it was not clear to me initially why propagation was useful: (propagated-inputs ;; The code XSD generates requires the following library at run time; ;; propagate it for convenience. `(("xerces-c" ,xerces-c))) > + (synopsis "XML Schema to C++ translator") > + (description "@package{xsd} is a W3C XML Schema to C++ translator. = It > +generates vocabulary-specific, statically-typed C++ mappings/bindings fr= om XML > +Schema definitions. It supports two C++ mappings: in-memory C++/Tree and > +event-driven C++/Parser.") > + (home-page "https://codesynthesis.com/projects/xsd/") > + (license license:gpl2+))) For this package, I also had an unfinished version locally; the description was slightly more accurate, with an extra comment for the license: + (synopsis "XML Data Binding for C++") + (description "CodeSynthesis XSD (also known as libxsd or xsdcxx) is an= XML +Schema to C++ data binding compiler. Provided with an XML instance +specification (XML Schema), it generates C++ classes that represent the gi= ven +vocabulary as well as XML parsing and serialization code. The data stored= in +XML can then be accessed using types and functions that semantically +correspond to an application domain rather than dealing with the intricaci= es +of reading and writing XML.") + (home-page "https://codesynthesis.com/projects/xsd/") + ;; Exceptions are made to allow using the generated source files as we= ll + ;; as the libxsd library in free software projects whose license is + ;; incompatible with the GPL v2. Refer to the file named FLOSSE for t= he + ;; details. So I've used those parts and pushed as commit 510e24f973. Phew. I've now reached the core bits of the review, to be continued. Thanks :-) Maxim