X-Loop: help-debbugs@HIDDEN Subject: [bug#70020] [PATCH 1/1] * gnu: Add debian-devscripts. Resent-From: Steve George <steve@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Tue, 26 Mar 2024 20:43:01 +0000 Resent-Message-ID: <handler.70020.B.171148572424901 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 70020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70020 <at> debbugs.gnu.org Cc: Steve George <steve@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.171148572424901 (code B ref -1); Tue, 26 Mar 2024 20:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2024 20:42:04 +0000 Received: from localhost ([127.0.0.1]:35180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rpDcS-0006TY-9q for submit <at> debbugs.gnu.org; Tue, 26 Mar 2024 16:42:04 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1rpDcP-0006SV-68 for submit <at> debbugs.gnu.org; Tue, 26 Mar 2024 16:42:02 -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 <steve@HIDDEN>) id 1rpDcJ-0001Z1-8x for guix-patches@HIDDEN; Tue, 26 Mar 2024 16:41:56 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <steve@HIDDEN>) id 1rpDcF-00077D-7b for guix-patches@HIDDEN; Tue, 26 Mar 2024 16:41:55 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1rpDc8-00HHz9-Ho for guix-patches@HIDDEN; Tue, 26 Mar 2024 21:41:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From; bh=Ua3FVbkXERWQfpx2dwvi+bYDlu71YKN6VYts0sDc2fM=; b=NWQvaSzYHfVJjyi9m+giCQ2OLm YA1rYwPR15CBtljx7vI286mCUzUGCaGUgG9TlLZ9DkhnDXA/h8H48MB/9l4zUL3PbSVdQK42/r6IW DDk1w8IEgpSeiDi3aJwKCxEJjcXMbU2l3f/7D5o4Pg1Kfm63jgKFBfOOm9EBbvJ07YiOILctu2l9N bq6bT7qmKlTg4xfqAlnd1tPpt+S03VXJETNss+RAIBsOi0MnRArv8dUYrL3HwAUjZL6RqKAPVyFou y8HGZz5Zl1d9At5QFkgFi+Ho262xm/adcLNUsIyn01hxvrogKB3MnTOY49VbUBdrfskQse9aDp4uU uH7Wh7ig==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1rpDc8-0000FN-6c for guix-patches@HIDDEN; Tue, 26 Mar 2024 21:41:44 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rpDc0-009AMI-Lr; Tue, 26 Mar 2024 21:41:36 +0100 From: Steve George <steve@HIDDEN> Date: Tue, 26 Mar 2024 20:41:25 +0000 Message-ID: <b6d8a95e03a346c44df5ba9cdfdf175c0c82131b.1711485320.git.steve@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: permerror client-ip=2a0c:5a00:149::26; envelope-from=steve@HIDDEN; helo=mailtransmit05.runbox.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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,")) + (rename-file "bts.pl" "bts") + (install-file "bts" bin)) + (with-directory-excursion "lib/Devscripts/" + (for-each (lambda (f) (install-file f devscripts-lib)) + (find-files "./"))))))))) + (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)) + (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.") + (license license:gpl2))) + (define-public debootstrap (package (name "debootstrap") base-commit: 40f53e8fb5b867e3a1e8fa798328423718282aac -- 2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Steve George <steve@HIDDEN> Subject: bug#70020: Acknowledgement ([PATCH 1/1] * gnu: Add debian-devscripts.) Message-ID: <handler.70020.B.171148572424901.ack <at> debbugs.gnu.org> References: <b6d8a95e03a346c44df5ba9cdfdf175c0c82131b.1711485320.git.steve@HIDDEN> X-Gnu-PR-Message: ack 70020 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70020 <at> debbugs.gnu.org Date: Tue, 26 Mar 2024 20:43:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 70020 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 70020: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70020 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#70020] [PATCH 1/1] * gnu: Add debian-devscripts. Resent-From: Jelle Licht <jlicht@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 31 Mar 2024 21:10:02 +0000 Resent-Message-ID: <handler.70020.B70020.171191934417827 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 70020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Steve George <steve@HIDDEN>, 70020 <at> debbugs.gnu.org Received: via spool by 70020-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rr2QJ-0004dT-Id for submit <at> 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 <jlicht@HIDDEN>) id 1rr2QG-0004ct-B2 for 70020 <at> debbugs.gnu.org; Sun, 31 Mar 2024 17:09:02 -0400 From: Jelle Licht <jlicht@HIDDEN> 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: <b6d8a95e03a346c44df5ba9cdfdf175c0c82131b.1711485320.git.steve@HIDDEN> References: <b6d8a95e03a346c44df5ba9cdfdf175c0c82131b.1711485320.git.steve@HIDDEN> Date: Sun, 31 Mar 2024 23:08:53 +0200 Message-ID: <87zfuef6sa.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Steve, Steve George <steve@HIDDEN> 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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.