From patchwork Tue Mar 21 15:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gruruya X-Patchwork-Id: 48514 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 61C3A16F73; Tue, 21 Mar 2023 16:45:51 +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_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AEA3016EE5 for ; Tue, 21 Mar 2023 16:45:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pef6c-0004AV-ES; Tue, 21 Mar 2023 12:45:02 -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 1pee2r-0004ty-5y for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:07 -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 1pee2q-0002aJ-Th for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pee2q-0003cA-PI for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62344] [PATCH] gnu: nim: Update to 1.6.12. Resent-From: Gruruya Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 15:37:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62344 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62344@debbugs.gnu.org Cc: Gruruya X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167941301613813 (code B ref -1); Tue, 21 Mar 2023 15:37:04 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 15:36:56 +0000 Received: from localhost ([127.0.0.1]:60261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pee2h-0003ac-LH for submit@debbugs.gnu.org; Tue, 21 Mar 2023 11:36:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:36954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pedZ9-0000QB-VD for submit@debbugs.gnu.org; Tue, 21 Mar 2023 11:06:24 -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 1pedZ5-0002SV-P8 for guix-patches@gnu.org; Tue, 21 Mar 2023 11:06:20 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pedZ3-00009Y-PQ for guix-patches@gnu.org; Tue, 21 Mar 2023 11:06:19 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 07CFB41339; Tue, 21 Mar 2023 16:06:15 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pt2ZQHm6QeQF; Tue, 21 Mar 2023 16:06:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1679411173; bh=aAlh5Bvx4/gYQeM+ZtKlj8B66Hmgo2/SDBO/gc/yaRc=; h=From:To:Cc:Subject:Date; b=EwaZS9BHPZSyt/o4Aurqohr5+aH/ukA2G0Ter2HT8A+9X9DUUVn6QOB+h7OS0wv0z 6Ee5HRsiqzshc1oVd/M91YsE58HQCtJSALPpdE4lHJKMTKwKWxEZ6Kbe6M+bV6bew5 pJwbgPiByGaWFnhxgCy9l9kMqo47v15ApvZSytBxsd+EmC0vr8VR+/YnyYNl/fYqec 9uwBpvAIuWHpshpCwvFNo7m24JEmjs7f+9Qvyi5L+cTVLgWgZByKyXGyqFAnKWYHvI q41+Oylc+v/Mkhjt+KwkasZfR17mjJ4u4J7KAdEJZoUBzsNWnlGiOy5RaPmuvU+UWn trw7KL7Uj4wCw== Date: Tue, 21 Mar 2023 11:06:04 -0400 Message-Id: <08c022e165e3004433e931731c28b407e667d4cd.1679411164.git.greytest@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=greytest@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 21 Mar 2023 11:36:52 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 21 Mar 2023 12:45:00 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Gruruya X-ACL-Warn: , Gruruya via Guix-patches X-Patchwork-Original-From: Gruruya via Guix-patches via From: Gruruya 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/nim: Update to 1.6.12. [patch-installer]: Install /lib to right directory. [patch-more-shebangs]: Edit substitute* to point to new osproc source. --- gnu/packages/nim.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) base-commit: 088a3d4c34cbbe74ee0fb56836c0353f0331960d diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 6da382119f..77c2463cca 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -36,14 +36,14 @@ (define-module (gnu packages nim) (define-public nim (package (name "nim") - (version "1.6.6") + (version "1.6.12") (source (origin (method url-fetch) (uri (string-append "https://nim-lang.org/download/" name "-" version ".tar.xz")) (sha256 - (base32 "0lm4450ig8k4l3rzxv6kcqji5l1lzicsw76ckwxm0q9qdz713cb7")))) + (base32 "1hjd9dxhqzn2ifr988li8q7v6kxpxlcqbdllfd6lsq3knw50pvxc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; TODO: Investigate tests failures. @@ -55,6 +55,7 @@ (define-public nim (let ((out (assoc-ref outputs "out"))) (substitute* "install.sh" (("/usr/local") out) + (("/lib/nim") "/lib") (("/opt/nimble") (string-append out "/share/nimble")) (("configdir=/etc/nim") (string-append "configdir=" out "/etc/nim")))))) @@ -102,7 +103,7 @@ (define-public nim "lib/pure/osproc.nim" "lib/pure/strscans.nim") (("/bin/sh") sh)) - (substitute* (find-files "c_code" "stdlib_osproc\\.nim\\.c") + (substitute* (find-files "c_code" "@m\\.\\.@slib@spure@sosproc\\.nim\\.c") (("\"/bin/sh\", 7") (format #f "~s, ~s" sh (string-length sh))))))) (replace 'build (lambda* (#:key (parallel-build? #t) #:allow-other-keys)