From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GAKAKTnRCWbUSAAAe85BDQ:P1 (envelope-from ) for ; Sun, 31 Mar 2024 23:10:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GAKAKTnRCWbUSAAAe85BDQ (envelope-from ) for ; Sun, 31 Mar 2024 23:10:17 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=QXjRiTSE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711919417; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=YbOtDR5ydmh+8RUvk1EqlaWzummPHRJ57tkWQKql6C4=; b=sgKt21j/YdSzvkHxG3QIUDH6w7XuFFUYXSWFt6htRxATulgJOKstNc1N4CWA4i4qOp8HIO ZPjzEyBCGO3xb3HhmFVGfpcpPPdeSMrDplui4RRkZo4QagV99IGWGGPVzxThSdTZXmqsz0 IixdhhH7IcIF1X274cqsrus5/HxUTmFFQmQSrPEPAWiyh7NZ7TS2rLD616wvzXJ8OzJad9 MFEUZSAoTpjvX3ACi2rZ3OFTcWT5bWYyaLE5OjMVTYJNAMjAZSlNuzNTxgFYnk0tj5miRp DueQ33frLMaXPbZHCdE7kHEd4pGASxc6vOD7W5LZ9D3ncIdTDDbfNdmQnlmZbg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=QXjRiTSE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711919417; a=rsa-sha256; cv=none; b=cU5aYjBLvuFSf/p3KX5vmfafXTmH4cMUAhLWlbefVRE5w1EvTH1qAMnOQRZYe3knZnfmtk z+FRcLBmK15gk/d308CQhmudcqHOyf8kc7bNEJ9ud8rfqs/OzHkJ33+wOR4uaxc1lz4Dnk aBdd2NqHXZgIFmLLOVAmwHwkjLdCLMlsdM+rx17PVyWrnKYIjvfHL5zvvNFjLJTFFZR5uT eZOVluX4JECdlvWpYNX29GcvTPSg6I7ouA5Si29EUzqcLZO0aU0JBWc4yuBp5l6igN1HvV +Nj/Fk8vZQb4ensqvLhz+IwfUnWtJhINyjsBFYeyMUzEUKogj5LI5VdNUOzHbA== 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 538CAFAE for ; Sun, 31 Mar 2024 23:10:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr2RF-0007jC-B4; Sun, 31 Mar 2024 17:10:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr2RD-0007iv-RX for guix-patches@gnu.org; Sun, 31 Mar 2024 17:10:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr2RD-0004xb-Ip for guix-patches@gnu.org; Sun, 31 Mar 2024 17:09:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr2RG-0004ev-93 for guix-patches@gnu.org; Sun, 31 Mar 2024 17:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70020] [PATCH 1/1] * gnu: Add debian-devscripts. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 21:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Steve George , 70020@debbugs.gnu.org Received: via spool by 70020-submit@debbugs.gnu.org id=B70020.171191934417827 (code B ref 70020); Sun, 31 Mar 2024 21:10:02 +0000 Received: (at 70020) by debbugs.gnu.org; 31 Mar 2024 21:09:04 +0000 Received: from localhost ([127.0.0.1]:48708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr2QJ-0004dT-Id for submit@debbugs.gnu.org; Sun, 31 Mar 2024 17:09:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:51124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr2QG-0004ct-B2 for 70020@debbugs.gnu.org; Sun, 31 Mar 2024 17:09:02 -0400 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1711919336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YbOtDR5ydmh+8RUvk1EqlaWzummPHRJ57tkWQKql6C4=; b=QXjRiTSEh20i9zvR+5OQ5IVU3Zi/sYqeFbPXYIVTJcY5SLVa+o/YBnzWLdISJNr/H8TI2C 7dkVdyUgPzPf4ysK0gjufNuEF78nvOGxGMmm53cDnbibyxZ9TbAZVeweFyMtX4zKe/fcQm V7x5bKI8Djkz1jdP1KDj7rq1nYrPHFw= In-Reply-To: References: Date: Sun, 31 Mar 2024 23:08:53 +0200 Message-ID: <87zfuef6sa.fsf@fsfe.org> MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 538CAFAE X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 2.65 X-Spam-Score: 2.65 X-TUID: QUZN774qH+FQ Hi Steve, Steve George writes: > * gnu/packages/debian.scm (debian-devscripts): New variable. > > Change-Id: Iff64afdb1f730f3d941617bc428a57d09c0381b2 > --- > gnu/packages/debian.scm | 66 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 66 insertions(+) > > diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm > index 1715b963a93..ecec816d872 100644 > --- a/gnu/packages/debian.scm > +++ b/gnu/packages/debian.scm > @@ -27,6 +27,7 @@ (define-module (gnu packages debian) > #:use-module (guix packages) > #:use-module (guix build-system copy) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system perl) > #:use-module (guix build-system trivial) > #:use-module (gnu packages autotools) > #:use-module (gnu packages backup) > @@ -34,6 +35,7 @@ (define-module (gnu packages debian) > #:use-module (gnu packages bash) > #:use-module (gnu packages compression) > #:use-module (gnu packages crypto) > + #:use-module (gnu packages databases) > #:use-module (gnu packages dbm) > #:use-module (gnu packages gettext) > #:use-module (gnu packages gnupg) > @@ -43,6 +45,8 @@ (define-module (gnu packages debian) > #:use-module (gnu packages ncurses) > #:use-module (gnu packages perl) > #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages python) > + #:use-module (gnu packages web) > #:use-module (gnu packages wget) > #:use-module (srfi srfi-26)) > > @@ -211,6 +215,68 @@ (define-public ubuntu-keyring > (license (list license:public-domain ; the keys > license:gpl2+)))) ; see debian/copyright > > +(define-public debian-devscripts > + (package > + (name "debian-devscripts") > + (version "2.23.7") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://salsa.debian.org/debian/devscripts.git") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "031467rclglk1hdx8z2vzx5z88vpy0sk73qi8ni0sai3jx62ji75")))) > + (build-system gnu-build-system) > + (arguments > + (list > + #:tests? #f ; tests assume various Debian specific capabilities > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (delete 'build) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) > + (devscripts-lib (string-append (assoc-ref outputs "out") > + "/lib/perl5/site_perl/Devscripts"))) > + (with-directory-excursion "scripts" > + (substitute* "bts.pl" (("/bin/bash") (which "bash"))) > + (substitute* "bts.pl" (("/bin/rm") (which "rm"))) > + (substitute* "bts.pl" (("/bin/cat") (which "cat"))) > + ;; Avoid having to provide Debian's sensible-browser package > + (substitute* "bts.pl" > + (("my \\$browser;") "my $browser = $ENV{'BROWSER'};")) > + (substitute* "bts.pl" > + (("'sensible-browser',") "$browser,")) This could be separate phase, such as: (add-after 'unpack 'patch-programs ...) > + (rename-file "bts.pl" "bts") > + (install-file "bts" bin)) It seems this "only" installs bts, compared to the (huge) list of helper scripts I see listed in the repo README. IMHO not a blocker, but it should probably be reflected in either a comment or the package synopsis, name or description. Perhaps an acceptable compromise is to spin this off into just a 'bts' package? > + (with-directory-excursion "lib/Devscripts/" > + (for-each (lambda (f) (install-file f devscripts-lib)) > + (find-files "./"))))))))) This seems to not install any bash completions or manpages. IWBN to also install those, of at least make a comment w.r.t. them not being installed at this time. > + (native-inputs (list perl perl-libwww perl-uri pkg-config python)) > + (propagated-inputs > + (list dpkg > + perl-authen-sasl > + perl-db-file > + perl-encode > + perl-file-homedir > + perl-file-which > + perl-ipc-run > + perl-json > + perl-libwww > + perl-list-compare > + perl-lwp-protocol-https > + perl-moo > + perl-uri)) Would it be possible to wrap relevant scripts, in a similar manner to bioperl-minimal, and make most of these normal inputs instead of propagated-inputs? dpkg seems like something that could be patched to directly refer to a version directly in the store. > + (home-page "https://tracker.debian.org/pkg/devscripts") > + (synopsis "Scripts to make the life of a Debian Package maintainer easier") > + (description "Scripts that assist Debian packagers. Guix developers > +may find the bts command useful for interacting with GNU's debbugs server.") The description should contain full sentences. When you refer to bts, I'd use @code{bts} Texinfo markup as well. > + (license license:gpl2))) I did not check by going though all source files, but AFAICS, it's gplv2+. Or does the gplv2 refer to the devscripts files and bts.pl? In that case, a clarifying comment would be a welcome addition here. > (define-public debootstrap > (package > (name "debootstrap") > > base-commit: 40f53e8fb5b867e3a1e8fa798328423718282aac > -- > 2.41.0 Thanks, Jelle