From patchwork Sat Mar 25 12:30:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gruruya X-Patchwork-Id: 48668 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 3E02D16FBE; Sat, 25 Mar 2023 12:36:13 +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 4B94F16E4F for ; Sat, 25 Mar 2023 12:36:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg37t-0003Ce-8Y; Sat, 25 Mar 2023 08:36:05 -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 1pg37r-000352-2t for guix-patches@gnu.org; Sat, 25 Mar 2023 08:36:03 -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 1pg37q-00079x-Qc for guix-patches@gnu.org; Sat, 25 Mar 2023 08:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pg37q-0005BR-Fg for guix-patches@gnu.org; Sat, 25 Mar 2023 08:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62439] [PATCH] gnu: nim: Update to 1.6.12. Resent-From: Gruruya Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Mar 2023 12:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62439@debbugs.gnu.org Cc: Gruruya X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167974770919847 (code B ref -1); Sat, 25 Mar 2023 12:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2023 12:35:09 +0000 Received: from localhost ([127.0.0.1]:42068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pg36y-0005A0-8R for submit@debbugs.gnu.org; Sat, 25 Mar 2023 08:35:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:41458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pg36o-000595-Mv for submit@debbugs.gnu.org; Sat, 25 Mar 2023 08:35:06 -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 1pg36n-00022s-1E for guix-patches@gnu.org; Sat, 25 Mar 2023 08:34:57 -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 1pg36k-0006qT-S2 for guix-patches@gnu.org; Sat, 25 Mar 2023 08:34:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0CC1B41598; Sat, 25 Mar 2023 13:34:51 +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 AmRZFa4-sLHl; Sat, 25 Mar 2023 13:34:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1679747689; bh=/csO9imPKxVD5PecyEGiGG3SG0/hLVNDwGpCS5IXbVU=; h=From:To:Cc:Subject:Date; b=BvdZPqsgIX7ojZVXj5KQrI6bEZyfR+/tefR0UZq6oX3tiB1laNbB3An15BuESOL2y 6dIGeMQ5LAs5FbdlszrGFjTzo0XUC68ownuhmyeK0UG2rjVua8tEOXiekkXhgm4YUk F8OAGLQfQ7UTqoLsH2RCOuRh7+9utUwxKYrVTvdNlzxX/V3vwVLYl5UPzg1RtyV+vf qGGrzgpyrDlpJ1zPsX8CuYbtSO3FDCrfNRzTczEd52ktkTihmS45qYxc2wOv9J+c0P F6YPoeM3EtQmBQm641ClYBe0pe+AxEckjpYroPBgPsCVBDiW0uPZLnTWeBMyA7DleG trd8tfPBeh9PQ== Date: Sat, 25 Mar 2023 08:30:28 -0400 Message-Id: <388d0ef1f46b45c91c8804096f2a2f35f3539742.1679747022.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-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: 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 Without the attached patch, Nim is broken on Guix as it searches for its stdlib in /lib while it was placed in /lib/nim. * gnu/packages/nim: Update to 1.6.12. [patch-installer]: Install stdlib source to the right directory. [patch-more-shebangs]: Edit substitute* to point to the new osproc source. --- gnu/packages/nim.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) base-commit: a7f118d062db4408b23505750c44a1f996496c43 diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 6da382119f..ebcff26c7b 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2022 (unmatched parenthesis ;;; Copyright © 2022 Trevor Richards +;;; Copyright © 2023 Gruruya ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +37,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 +56,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 +104,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)