From patchwork Mon Nov 22 17:36:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34751 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 7758527BBE3; Mon, 22 Nov 2021 17:38:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B45527BBE1 for ; Mon, 22 Nov 2021 17:38:16 +0000 (GMT) Received: from localhost ([::1]:59822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGh-00058a-CO for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGV-000569-Mu for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGV-0008Te-F3 for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGV-0007A7-CU for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52039@debbugs.gnu.org Cc: zimoun Received: via spool by 52039-submit@debbugs.gnu.org id=B52039.163760264227438 (code B ref 52039); Mon, 22 Nov 2021 17:38:03 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:22 +0000 Received: from localhost ([127.0.0.1]:49018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFp-00078O-P5 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:22 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:43572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFk-00077J-FU for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:17 -0500 Received: by mail-wr1-f49.google.com with SMTP id t30so34076297wra.10 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bvo9PfC3ZyAVINK8SNVRmKxF3GEHOX58M7tRJgvzYlM=; b=fFM9b+RQUVXf/UnZVVnKgdJ4mF5SbYGsqHPEcTO4pC9IASyJYFy0842VrGhxdwqFLr ZlRjVusn3jxOeMLtDaKU/nqZqHy6HpNMRLEWPygJ7t48LUfPuSd4KtkzCwg9QsLWONik 3lZrsVhRXNqS1fooYdan/4i7r+9F7qXygH8mY267V7656K9oV1KaiOf9PSnwgPR9h0oF UgpNRhi+aZtMx8XH6vPBAIYduY/3VdDjBYxWoG0FZygijuyN6aEELZHMmsDKKbeOnEFP Xo9TbS55q4dB1kCDObbwkHI2LAB75seH0KX4bixy6413QyaVSGovXVBx0IR6gMLrh6eu K9jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bvo9PfC3ZyAVINK8SNVRmKxF3GEHOX58M7tRJgvzYlM=; b=aoeqJAgua/JMVmJHjo08TSdH6bqfS6nD58bFrN1E9zW1oOehgNZbTVRh89RDLnJh+D P8XUtZGvvgNn748863jcIu7h4PU2EVcsrGSiq8bKCccxwzwINHNluUAt2gJoyvHvGAQK v577gRwQsRZTQXZwv3xZcfYmw2bmtDsehcbYOeSU9t9od512lUljN+vaDHNtZCTMUkgp iGnjjBNUxNrxUgheTuyHzc11JE+vS6d+OtvC7PLZ8geL7Wty7e1ztoLnN1WdkVC2QWGx QwR//Hrr4SaS41KMbXHyRDQJYSfXEYkqlgW7fYE2P1pdCIdLWqIT2Ct/nF/3k7n8GH4h /Kiw== X-Gm-Message-State: AOAM530ygNwteHsrooD8sS33e6vg5WoeTXLjG+mY6Hw7DnwcmqczJ+tw AOxCUTZH48dv56HgzWNVnHseuQ1pshA= X-Google-Smtp-Source: ABdhPJw2BiqsW6FeH30mATq92OFPmEoAeV2cVfZruv7EcehmyXGDfM4Dt5A3cxSGnH5ZFaYeNlWMwQ== X-Received: by 2002:adf:dec9:: with SMTP id i9mr40780535wrn.18.1637602630888; Mon, 22 Nov 2021 09:37:10 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:10 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:36:59 +0100 Message-Id: <20211122173702.59732-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122173702.59732-1-zimon.toutoune@gmail.com> References: <20211122173702.59732-1-zimon.toutoune@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-charinfo-width): Replace 'url-fetch' by 'git-fetch' and update to unreleased commit. --- gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 82670fec7f..92ace48abb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3992,30 +3992,33 @@ (define-public ocaml-camomile (license license:lgpl2.0+))) (define-public ocaml-charinfo-width - (package - (name "ocaml-charinfo-width") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/zandoye/charinfo_width" - "/get/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) - (build-system dune-build-system) - (propagated-inputs - `(("ocaml-result" ,ocaml-result) - ("ocaml-camomile" ,ocaml-camomile))) - (native-inputs - `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) - (properties - `((upstream-name . "charInfo_width"))) - (home-page "https://bitbucket.org/zandoye/charinfo_width/") - (synopsis "Determine column width for a character") - (description "This module is implements purely in OCaml a character width + ;; Add LICENSE file and Dune tests + (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620")) + (package + (name "ocaml-charinfo-width") + (version (git-version "1.1.0" "1" commit)) + (home-page "https://github.com/kandu/charinfo_width/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04gil5hxm2jax9paw3i24d8zyzhyl5cphzfyryvy2lcrm3c485q0")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (properties + `((upstream-name . "charInfo_width"))) + (synopsis "Determine column width for a character") + (description "This module is implements purely in OCaml a character width function that follows the prototype of POSIX's wcwidth.") - (license license:expat))) + (license license:expat)))) (define-public ocaml4.07-zed (package