From patchwork Mon Mar 20 17:23:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48348 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 848DE16F39; Mon, 20 Mar 2023 17:30:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 C6FBF16F2D for ; Mon, 20 Mar 2023 17:30:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJHc-00054i-9I; Mon, 20 Mar 2023 13:26:56 -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 1peJHH-0004ip-Ol for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:35 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJHH-0005Z5-DZ for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJHH-00046l-90 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:35 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 179/223] gnu: Add fpm. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:35 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933316015105 (code B ref 62196); Mon, 20 Mar 2023 17:26:35 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:26:00 +0000 Received: from localhost ([127.0.0.1]:56205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGh-0003vR-HJ for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:59 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:33699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFx-0003jw-Ma for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:14 -0400 Received: by mail-qv1-f50.google.com with SMTP id m6so8095287qvq.0 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hb3vna0Sjsw67y59QooyKpD+eFnqm7to+cJrtka3Fmg=; b=naAX51xNisYTA7swtDIF6/4szD2vrEYXY2z0MP+tcC9uZ41AI8A6vt6uD210PY5ysv LibvmyaAAH/OJz8JWDsTfZyti3tb1Lht8ipSPBKEGt3QIjxpjohwxQdK3wD8oKH66giF TVblDqCaxBwLUrTJsFCr7mJhjAgsL2SDaY7ddvZ2aZootYIMXG6/4LXZ4oQTwCx4at5Q sQjArbCHqit0l3l/HVztaxHmX+J72h5wChK9dBvCM41Nc+PlBolJXg+sEd+I0yUYG4KO 0QzRAXbgUc12Ygo3t9n8BKW9M/8L8auU6he8eLrx4hEGtm3zh6hKpzyWOfqb2RbdXSGZ T0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hb3vna0Sjsw67y59QooyKpD+eFnqm7to+cJrtka3Fmg=; b=VSvKMHhfL3xC7noYrcRiq1gOeA40Sr0oMRfOE1HHf9AjUjtn4y9MRy3GbOnqwcObGM NgR0te0A7GBtCyOAIkUU1IBqsvGKst3EhkjWndqmmacleBPIZsemrC1nG9FgWExwQpzj e+jCy4GuMaZqxI9Tjh8DYHAJ29iGudlsm1w0uEVt1lFA6h0Z0ZHs6Yvk2Nbie9jJJNru cDPxlFbiBLhsmVO/LZAEnO1M+t0B55/4OsAcRw0t7atC30Zx7qL3L5shrF6tsT9RZ7Is UTQmfdLsiGNUJ4jA7EdDgZZxO9czmX06oubFmqhrUjSde/TuNoK6PUn2e1Rn74zZHVKL kblw== X-Gm-Message-State: AO0yUKWPt7z8fsAt6PbrjplPBQuYR0Aj1hyDAl06sfBfqTSPQS+UEbw2 9e8MZkmZwDENMFt19g5eTdLV17Dm1uc= X-Google-Smtp-Source: AK7set+kbUgBJVKtkmlRxsYLXMReD3wC0dYS6AH27EUngRDo28ykI9oOCiiDwzM4MJLpwrLz0czrVQ== X-Received: by 2002:a05:6214:27c9:b0:5b4:ccc0:4f36 with SMTP id ge9-20020a05621427c900b005b4ccc04f36mr22359281qvb.36.1679333107990; Mon, 20 Mar 2023 10:25:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.25.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:25:07 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:23:05 -0400 Message-Id: <20230320172349.12752-78-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-1-maxim.cournoyer@gmail.com> 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/package-management.scm (fpm): New variable. --- gnu/packages/package-management.scm | 80 +++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d27c8a91ef..ad366c7392 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -59,6 +59,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages databases) + #:use-module (gnu packages debian) #:use-module (gnu packages dejagnu) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) @@ -87,6 +88,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) + #:use-module (gnu packages node) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) @@ -98,6 +100,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) @@ -117,6 +120,7 @@ (define-module (gnu packages package-management) #:use-module (guix build-system guile) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system ruby) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) @@ -2003,6 +2007,82 @@ (define-public flatpak sandboxed desktop applications on GNU/Linux.") (license license:lgpl2.1+))) +(define-public fpm + (package + (name "fpm") + (version "1.15.1") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/jordansissel/fpm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m2zxf7wyk7psvm611yxs68hnwm0pyqilsmcq3x791hz7rvbg68w")))) + (build-system ruby-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("lib/fpm/util.rb" + "spec/fpm/util_spec.rb" + "spec/fpm/package/rpm_spec.rb") + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "bin/sh") + "\""))))) + (add-after 'extract-gemspec 'disable-problematic-tests + ;; Disable some tests which are failing (see: + ;; https://github.com/jordansissel/fpm/issues/2000). + (lambda _ + ;; There are 4 'NoMethodError' test failures in the + ;; command_spec suite, for unknown reasons. + (delete-file "spec/fpm/command_spec.rb") + (substitute* "spec/fpm/package_spec.rb" + (("@oldtmp = ENV\\[\"TMP\"]" all) + "skip('fails with guix')")) + (substitute* "spec/fpm/package/cpan_spec.rb" + ;; This test is marked as expected to fail (pending) when + ;; TRAVIS_OS_NAME is set, but passes with Guix; skip it. + (("it \"should unpack tarball containing" all) + (string-append "x" all))) + (substitute* "spec/fpm/package/gem_spec.rb" + ;; This test fails for unknown reason; perhaps a patched + ;; shebang. + (("it 'should not change the shebang'" all) + (string-append "x" all))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Set TRAVIS_OS_NAME to skip tests known to cause + ;; problems in minimal environments. + (setenv "TRAVIS_OS_NAME" "GNU Guix") + (invoke "rspec"))))))) + (native-inputs + (list dpkg + libarchive + node + perl-app-cpanminus + python + ruby-rspec + squashfs-tools + zstd)) + (inputs + (list bash-minimal + ruby-arr-pm + ruby-backports + ruby-cabin + ruby-clamp + ruby-pleaserun + ruby-rexml + ruby-stud)) + (home-page "https://github.com/jordansissel/fpm/") + (synopsis "Package building and mangling tool") + (description "@command{fpm} is a command to convert directories, RPMs, +Python eggs, Ruby gems, and more to RPMs, debs, Solaris packages and more.") + (license license:expat))) + (define-public akku (package (name "akku")