From patchwork Mon Apr 1 20:52:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve George X-Patchwork-Id: 62451 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4351127BBE2; Mon, 1 Apr 2024 21:54:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 57A3C27BBEA for ; Mon, 1 Apr 2024 21:54:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrOfJ-0006RC-My; Mon, 01 Apr 2024 16:54: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 1rrOfI-0006Qs-Kg for guix-patches@gnu.org; Mon, 01 Apr 2024 16:54: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 1rrOfI-0004CK-Bz for guix-patches@gnu.org; Mon, 01 Apr 2024 16:54:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrOfL-0008Eq-Kv for guix-patches@gnu.org; Mon, 01 Apr 2024 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70020] [PATCH v2 1/1] * gnu: Add debian-devscripts. Resent-From: Steve George Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 20:54:03 +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: 70020@debbugs.gnu.org Cc: jlicht@fsfe.org, steve@futurile.net X-Debbugs-Original-Cc: jlicht@fsfe.org, guix-patches@gnu.org, Steve George Received: via spool by 70020-submit@debbugs.gnu.org id=B70020.171200483731623 (code B ref 70020); Mon, 01 Apr 2024 20:54:03 +0000 Received: (at 70020) by debbugs.gnu.org; 1 Apr 2024 20:53:57 +0000 Received: from localhost ([127.0.0.1]:51819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOfE-0008Dz-DB for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:53:56 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:48820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOfB-0008DX-Ji for 70020@debbugs.gnu.org; Mon, 01 Apr 2024 16:53:54 -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 ) id 1rrOf2-00FXoI-Io; Mon, 01 Apr 2024 22:53:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From; bh=xA4IT5tr0q0GiJJVsf8U+8Fk+GlKurKdjPyP5+HMOM8=; b=P+hYfBaDHbu0tl2er5hsvw6hWw 3k0Li8c7EJc1OHjmUC+AAqDBHHqw2T7T+HW7+FKCucc5rHpjdvAqOitYmIZ1dLpxWsHzjwe6Ftmqy 5QwAOBIVRVGB/JXuRl+iLI/wEoTC8GRmM1yA+d8h3rf4lPilhCQ4109iVSdU9x1ZAjjVSR4b6HPXC LoubDeoAIy9zxTDmuNIH1X9800y+Jj9yEc3hcQfU3F2gEnaeF8gtLiVA8cRY/i+EjndEPyfev1vzU nf+bznwSA6+E5M/kVFR2RXWa98YqJsYD2J4sGGiZ3i/LhCaFlULEe/WudP+LYSQ0mqDPichZEalQv dw2nstdw==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rrOes-0004EZ-5z; Mon, 01 Apr 2024 22:53:34 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rrOef-00Cu5u-3r; Mon, 01 Apr 2024 22:53:21 +0200 From: Steve George Date: Mon, 1 Apr 2024 21:52:15 +0100 Message-ID: <6ff2720d046e5b553bb655966c21a4041385ed96.1712003588.git.steve@futurile.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/debian.scm (debian-devscripts): New variable. Change-Id: Iff64afdb1f730f3d941617bc428a57d09c0381b2 --- gnu/packages/debian.scm | 104 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 1715b963a93..88060d3395d 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,7 +45,10 @@ (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-1) #:use-module (srfi srfi-26)) (define-public debian-archive-keyring @@ -211,6 +216,105 @@ (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 perl-build-system) ;; bioperl-live used perl - I was using gnu + (arguments + (let ((transitive-inputs + (map (compose package-name cadr) + (delete-duplicates + (concatenate + (map (compose package-transitive-target-inputs cadr) + (package-inputs this-package))))))) + (list + #:tests? #f ; tests assume various Debian specific capabilities + #:phases + ;; only includes the bts command as that's useful for Guix packagers + #~(modify-phases %standard-phases + (add-after 'bootstrap 'patch-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (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")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin")) + (bashcomp (string-append #$output + "/etc/bash_completion.d")) + (perl-lib (string-join + (cons (string-append #$output + "/lib/perl5/site_perl/Devscripts") + (map (lambda (name) + (assoc-ref %build-inputs name)) + #$transitive-inputs)) + ":")) + ;(perl-lib (string-append #$output + ; "/lib/perl5/site_perl/Devscripts")) + (doc (string-append #$output + "/share/doc/" #$name "-" #$version))) + (with-directory-excursion "scripts" + (for-each (lambda (f) (install-file f bin)) + '("bts")) + (mkdir-p bashcomp) + (copy-file "bts.bash_completion" (string-append bashcomp "/bts"))) + ;(with-directory-excursion "lib/Devscripts/" + ;(for-each (lambda (f) (install-file f perl-lib)) + ; (find-files "./"))) + (for-each (lambda (f) (install-file f doc)) + '("README"))))) + (add-after 'install 'manpage + ;; FIXME: missing the man page for bts, how is it created? + (lambda* (#:key outputs #:allow-other-keys) + (let ( (man1 (string-append #$output "/share/man/man1")) + (man5 (string-append #$output "/share/man/man5"))) + (with-directory-excursion "doc" + (invoke "make" "devscripts.1") + (install-file "devscripts.1" man1) + (install-file "devscripts.conf.5" man5))))))))) + (inputs (list dpkg perl-authen-sasl perl-db-file)) + (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 "BTS script from Debian's devscripts") + (description "This package only provides the bts script from the Debian +devscripts archive. It's useful for Guix Developers that interacti with GNU's +debbugs server.") + (license license:gpl2))) + (define-public debootstrap (package (name "debootstrap")