From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KHDpGS3fGWQjsAAASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 17:45:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kIadGS3fGWRI7wAAauVa8A (envelope-from ) for ; Tue, 21 Mar 2023 17:45:33 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4395716179 for ; Tue, 21 Mar 2023 17:45:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pef6c-0004Am-M6; 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 1pee2p-0004tE-W1 for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:04 -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 1pee2p-0002Vs-Kt for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pee2p-0003bh-Gx for guix-patches@gnu.org; Tue, 21 Mar 2023 11:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62342] [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:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: greytest@disroot.org, 62342@debbugs.gnu.org X-Debbugs-Original-To: greytest@disroot.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167941301513798 (code B ref -1); Tue, 21 Mar 2023 15:37:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 15:36:55 +0000 Received: from localhost ([127.0.0.1]:60257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pee2g-0003aO-QR for submit@debbugs.gnu.org; Tue, 21 Mar 2023 11:36:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:46120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pecng-000591-TT for submit@debbugs.gnu.org; Tue, 21 Mar 2023 10:17:21 -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 1pecnU-0006tl-DL for guix-patches@gnu.org; Tue, 21 Mar 2023 10:17:11 -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 1pecnS-0002lm-M9 for guix-patches@gnu.org; Tue, 21 Mar 2023 10:17:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A9F8F445D9; Tue, 21 Mar 2023 15:17:05 +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 UTF8SMTP id LxiWeMaUnUjK; Tue, 21 Mar 2023 15:17:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1679408224; bh=3QrnonIlPBn06OtOvzyI7LJQDgpCCKmJpXpTL/3cyM0=; h=From:To:Subject:Date; b=VxcpZrqVh82U610rHc4x/NtgbJ3EyXnSMvX+vUq/+5BjJqiGMhE9SvD4aIUZo5NQK qHqCL7+18LoWIxbo7MrlbnSelwfaxtMH+NYscxJ6M6dSL826R3Qx01JwsqUbNeGkf4 hQUiz11zGs635BW551nmeOtKOIIU/8dZqgqEi7/cM4xsXitQ7MJv2XRmaebYtaFiLI jCnU8y56E7fjhsIuicxqeUjL0ylkOpQtUEk0g/kipER0WyygFKk5g+pEj8SVnZZljJ d586oJ5JSe9Eyo2e3RkTY3RvGXpkcHwrNSV2gZwLBT3uLO63g+1bV+xbkfelztl/Fp dd7TGaACWVVAQ== Date: Tue, 21 Mar 2023 10:16:56 -0400 Message-Id: <08c022e165e3004433e931731c28b407e667d4cd.1679407667.git.greytest@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Gruruya via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679417133; a=rsa-sha256; cv=none; b=uRObr6NuUe+WI2EIPDfXG+AouoX+HJ32KyGcTjvZ6D7iXwiVFqpGT7jhlGwGrx2LBTG5Hz bupLx5Q/4TzZvbMSfIYbb38JW0VBnV+hh2NGv0Fi5cCl0X5VV6FMUVM0keKLG+9uOdQUmp VfIp+9xpkK3iuwc4OtzEPqtXCdIuLdsJqu+K7ismvZKKcP7Rsa9oprqYYpaw9mgb5srxGo j0YyGoi1sH+MfmsbfnVeb5Mj5NhMWRvVrk6KCd4lgo1mvSp/kXs09633qtIlNfrFb+l4aJ waAKMFzSDYnGZbJ9WaqkMVBNPVaQkq9GcV8lpZe8xoI64BW9QvPyA/bDghuvjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=VxcpZrqV; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679417133; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UXt8B5l5lFaSkGw+uOA+m/4+Uo56DCif648eRE1Fxh0=; b=bYqfNZm5mCo5GmJR5hxVFZDTiMXDGDMdNmsw7Pmakjt3L/hRS7U5Bs+dmnbotgJsSQCC2z yWLBnTDZ9z1H4MlGboa+DVQXouZHVuTUExa1tNHqr7JR0DyTYhkeVIlMNz9cKMxeBXfLKv EOfznBVCalsT73hX0sOD2M6Ht5i3wNbegpK0m7vCJduVhqoByn9KXBzz0NaDg4t9waA1uS ISt4s51KvViwSxElwYt4Lzy2ldzUAD22c63NpMotFaKGEHuAX25ZQpBlY0UV86Nj9TJK2T xUai5X8Z6wvq7mUxGYBtMNDI/W5mFDndlI1BqKVQnJkzY3yKJ1cIJRgYW2Fqkg== X-Migadu-Spam-Score: -2.45 X-Spam-Score: -2.45 X-Migadu-Queue-Id: 4395716179 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=VxcpZrqV; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: HHfGOLv6IzXO * 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(-) 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) -- 2.40.0