From patchwork Fri Jun 21 19:01:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Goryachev X-Patchwork-Id: 65566 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 EEFA427BBEA; Fri, 21 Jun 2024 20:03:38 +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 27AF327BBE2 for ; Fri, 21 Jun 2024 20:03:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKjXQ-0004CP-Rl; Fri, 21 Jun 2024 15:03:08 -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 1sKjXL-000482-Er for guix-patches@gnu.org; Fri, 21 Jun 2024 15:03:03 -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 1sKjXL-0007W4-5f for guix-patches@gnu.org; Fri, 21 Jun 2024 15:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKjXK-00059n-FS for guix-patches@gnu.org; Fri, 21 Jun 2024 15:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71707] [PATCH 06/15] gnu: elixir-makeup: Update to 1.1.2, make reproducible. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 19:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71707@debbugs.gnu.org Cc: Igor Goryachev , Andrew Tropin Received: via spool by 71707-submit@debbugs.gnu.org id=B71707.171899652519678 (code B ref 71707); Fri, 21 Jun 2024 19:03:02 +0000 Received: (at 71707) by debbugs.gnu.org; 21 Jun 2024 19:02:05 +0000 Received: from localhost ([127.0.0.1]:43761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWO-00057D-H4 for submit@debbugs.gnu.org; Fri, 21 Jun 2024 15:02:04 -0400 Received: from mail.goryachev.org ([104.248.201.73]:36220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWE-00054o-Vb for 71707@debbugs.gnu.org; Fri, 21 Jun 2024 15:01:55 -0400 Received: from localhost.localdomain (213-91-248-88.ip.btc-net.bg [213.91.248.88]) by mail.goryachev.org (Postfix) with ESMTPSA id 1718312034D; Fri, 21 Jun 2024 22:01:55 +0300 (MSK) Date: Fri, 21 Jun 2024 22:01:12 +0300 Message-ID: <47b0d6f93a1da8ccc1f587120615223075baa3b1.1718992389.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=goryachev.org; s=dkim; t=1718996515; bh=GGpwgFoQXvz6BAoyzReQiMHHrbreV4TjwWkiC4Xwf6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; b=MhjzSyCG607A46iD2b61iMpwRT0V5VhCfH6w7+otaYKBylj+d6Tk4or2rkQ0T/yBEh+fFgzMGctlio4Sem7bu2RkqY/ZprHZVmr4r6D7pHJyKtJOlgib+50DwfjaBU5VZOJ2wIv5+xuRBUj2NxQ8OUAy9nGXRKAfNGmSUMzuIFk= 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: , Reply-to: Igor Goryachev X-ACL-Warn: , Igor Goryachev via Guix-patches X-Patchwork-Original-From: Igor Goryachev via Guix-patches via From: Igor Goryachev 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/elixir-xyz.scm (elixir-makeup): Update to 1.1.2, make reproducible. Change-Id: I43fca3e4d1f6d2a5e678940416710c126b51a59b --- gnu/packages/elixir-xyz.scm | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm index 69e3a53ff3..9f3601c427 100644 --- a/gnu/packages/elixir-xyz.scm +++ b/gnu/packages/elixir-xyz.scm @@ -24,6 +24,8 @@ (define-module (gnu packages elixir-xyz) #:use-module (gnu packages compression) #:use-module (gnu packages base) #:use-module (gnu packages) + #:use-module (guix build mix-build-system) + #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system mix) #:use-module (guix download) @@ -56,20 +58,44 @@ (define-public elixir-nimble-parsec (define-public elixir-makeup (package (name "elixir-makeup") - (version "1.1.0") + (version "1.1.2") (source (origin (method url-fetch) (uri (hexpm-uri name version)) (sha256 - (base32 "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a")))) + (base32 "1b3civqrznn3dxqa3iybwbpgj8dj6f7q1zlgr8gd5jzvh5mmdqfc")))) (build-system mix-build-system) (propagated-inputs (list elixir-nimble-parsec)) - (arguments (list #:tests? #f)) ; no tests + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "lib/makeup/token/utils.ex" + (("@precedence Hierarchy.hierarchy_to_precedence\\(@hierarchy\\)") + "")) + (substitute* "lib/makeup/token/utils.ex" + (("@token_to_class_map Hierarchy.style_to_class_map\\(@hierarchy\\)") + "")) + (substitute* "lib/makeup/token/utils.ex" + (("@standard_token_types Map.keys\\(@token_to_class_map\\)") + "")) + (substitute* "lib/makeup/token/utils.ex" + (("@precedence") + "Hierarchy.hierarchy_to_precedence(@hierarchy)")) + (substitute* "lib/makeup/token/utils.ex" + (("@token_to_class_map") + "Hierarchy.style_to_class_map(@hierarchy)")) + (substitute* "lib/makeup/token/utils.ex" + (("@standard_token_types") + "Map.keys(token_to_class_map())"))))))) (synopsis "Syntax highlighter for source code") (description - "Makeup is a generic syntax highlighter in the style of Pygments suitable for use in code hosting, -forums, wikis or other applications that need to prettify source code.") + "Makeup is a generic syntax highlighter in the style of Pygments suitable +for use in code hosting, forums, wikis or other applications that need to prettify +source code.") (home-page "https://hexdocs.pm/makeup/") (license license:bsd-2)))