From patchwork Sun Oct 29 14:36:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Pierre-Henry_Fr=C3=B6hring?= X-Patchwork-Id: 55539 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 BCB0B27BBE2; Sun, 29 Oct 2023 14:42:28 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 BDF2627BBEA for ; Sun, 29 Oct 2023 14:42:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qx6yr-00048h-Cd; Sun, 29 Oct 2023 10:41:33 -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 1qx6yp-00047e-Mx for guix-patches@gnu.org; Sun, 29 Oct 2023 10:41:31 -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 1qx6yp-0003cM-AY for guix-patches@gnu.org; Sun, 29 Oct 2023 10:41:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qx6zL-0007et-TZ for guix-patches@gnu.org; Sun, 29 Oct 2023 10:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66801] [PATCH va3e5ae0f..37252e07 06/32] gnu: erlang-rebar3-git-vsn: moved to erlang-xyz.scm Resent-From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 14:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66801 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66801@debbugs.gnu.org Cc: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Received: via spool by 66801-submit@debbugs.gnu.org id=B66801.169859047929067 (code B ref 66801); Sun, 29 Oct 2023 14:42:03 +0000 Received: (at 66801) by debbugs.gnu.org; 29 Oct 2023 14:41:19 +0000 Received: from localhost ([127.0.0.1]:42994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx6yc-0007Yc-F1 for submit@debbugs.gnu.org; Sun, 29 Oct 2023 10:41:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:55706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qx6yT-0007XH-5U for 66801@debbugs.gnu.org; Sun, 29 Oct 2023 10:41:09 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32deb2809daso2302925f8f.3 for <66801@debbugs.gnu.org>; Sun, 29 Oct 2023 07:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=deeplinks-com.20230601.gappssmtp.com; s=20230601; t=1698590430; x=1699195230; darn=debbugs.gnu.org; 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=9BbKEm+HtHFmZB0xz7S6Ck5Fyhp91dbWZzSum6AkmAc=; b=vUrJ7/Z6c0yvvGWBWoSs5gnLwIn4xFDsZRIc7i4wugtNcorjaS0JcYgXY4QEnxnBJV LiBI7f2W2TDwM3/z1LpY/WoQ+2G2kTEIJnmekgVpBMG8io4iTlmGb/9jaFkhQ6Y1VgmN hOjfWXBmf3DEOSGxHRvdnUa1Bjocr0XucMgndqV1oueNm9WNH3e4U6p1IjM7v6Nw/cBd pTZHQzaqIv+NVGT8cgMkTXE795d8Jz/v/O60TcGwmC4zzaQ0SrC2wKYvSg99aX8jO5ou kER6EDjLkWOxtQvYxaIdC4XcrVwQhaJn3/ZJZNCPuHiA6SsA+HAgDkwVxzb87DmySOdl kjFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698590430; x=1699195230; 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=9BbKEm+HtHFmZB0xz7S6Ck5Fyhp91dbWZzSum6AkmAc=; b=Ws+CtUu+Jbg5dBGemV6IPcbhpA3QC9oO7TE5G096IqoGQnwMGcp2j0eBS9WQnyc2oq V5GEhG807CWRsqHLNsQQ62XEt0UolzWUeLth3+4ORaBudZ9R/w3szZVTG8dIx/mnP3AJ mElUi0UDxkB2Tib+PURKxZN9umY8rQWKJpuOO9C4m0Q23D9DfkEXjO1nYRRpu6Br0leE YqllSfW3wAaG4a00d9q2IMLMGWQYsUNFCkwK01844jJxiI2KYs+dLmhHSYWCe0if2U3q 3iDitMUEc5E5DbSaND84VYf5zbtJxaGC0KZhTMc3I2i8P1GBE6+SnLo2vXzK4qLw/VSE loKQ== X-Gm-Message-State: AOJu0YwAejzEyVAcUU1JhBm4WFH2+pBf96H1xDaAmhm+4R9ppSE0diah ejfz5tjbeWQl3gJwUc6XRMroE8D2bSQqVAgc4Ic= X-Google-Smtp-Source: AGHT+IFNF+ablmeaqoOO/i9dQntRbKULTJEMsPeqZJwUtPazTXwkt5U7x7N+qD5PQdbNFTKIQL05pw== X-Received: by 2002:a5d:588f:0:b0:32f:7d70:529e with SMTP id n15-20020a5d588f000000b0032f7d70529emr2791802wrf.63.1698590430361; Sun, 29 Oct 2023 07:40:30 -0700 (PDT) Received: from doug.com ([2a01:e34:ec69:c8b0:530e:366:bd55:7769]) by smtp.gmail.com with ESMTPSA id s10-20020a5d69ca000000b00323287186aasm6059590wrw.32.2023.10.29.07.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:40:29 -0700 (PDT) From: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= Date: Sun, 29 Oct 2023 15:36:59 +0100 Message-ID: <44bec23d6d48ecc169f1bec65a465edd7c32e973.1698590244.git.phfrohring@deeplinks.com> 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 Change-Id: I5a743e71b2034ba1cfe71fe6121137b3194befed --- gnu/packages/erlang-xyz.scm | 32 +++++++++++++++++++++++++++++++- gnu/packages/erlang.scm | 31 ------------------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/gnu/packages/erlang-xyz.scm b/gnu/packages/erlang-xyz.scm index 5815d19f..bfc4802a 100644 --- a/gnu/packages/erlang-xyz.scm +++ b/gnu/packages/erlang-xyz.scm @@ -25,7 +25,6 @@ (define-module (gnu packages erlang-xyz) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix packages) #:use-module (guix utils) @@ -89,6 +88,37 @@ (define-public erlang-edown Markdown.") (license license:asl2.0))) +(define-public erlang-rebar3-git-vsn + (package + (name "erlang-rebar3-git-vsn") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (hexpm-uri name version)) + (sha256 + (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) + (build-system rebar-build-system) + (inputs + (list git-minimal/pinned)) + (arguments + `(;; Running the tests require binary artifact (tar-file containing + ;; samples git repos) TODO: remove these from the source + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (assoc-ref inputs "git-minimal"))) + (substitute* "src/rebar3_git_vsn.erl" + (("rebar_utils:sh\\(\"git " _) + (string-append "rebar_utils:sh(\"" git "/bin/git "))))))))) + (home-page "https://github.com/soranoba/rebar3_git_vsn") + (synopsis "Rebar3 plugin for generating the version from git") + (description "This plugin adds support for generating the version from +a git checkout.") + (license license:expat))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 5148abf0..6320e3d0 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -655,37 +655,6 @@ (define-public erlang-rebar3-raw-deps applications as a dependent libraries.") (license license:expat))) -(define-public erlang-rebar3-git-vsn - (package - (name "erlang-rebar3-git-vsn") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (hexpm-uri name version)) - (sha256 - (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) - (build-system rebar-build-system) - (inputs - (list git-minimal/pinned)) - (arguments - `(;; Running the tests require binary artifact (tar-file containing - ;; samples git repos) TODO: remove these from the source - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((git (assoc-ref inputs "git-minimal"))) - (substitute* "src/rebar3_git_vsn.erl" - (("rebar_utils:sh\\(\"git " _) - (string-append "rebar_utils:sh(\"" git "/bin/git "))))))))) - (home-page "https://github.com/soranoba/rebar3_git_vsn") - (synopsis "Rebar3 plugin for generating the version from git") - (description "This plugin adds support for generating the version from -a git checkout.") - (license license:expat))) - (define-public erlang-rebar3-proper (package (name "erlang-rebar3-proper")