From unknown Sat Aug 09 04:59:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61036] [PATCH 0/3] Update zig to 0.10.1 Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Jan 2023 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61036@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167455334518019 (code B ref -1); Tue, 24 Jan 2023 09:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jan 2023 09:42:25 +0000 Received: from localhost ([127.0.0.1]:55875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFou-0004gZ-Jy for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:42:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:37898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFot-0004gS-SQ for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:42:24 -0500 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 1pKFot-0005Ht-Iz for guix-patches@gnu.org; Tue, 24 Jan 2023 04:42:23 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKFor-00037R-LD for guix-patches@gnu.org; Tue, 24 Jan 2023 04:42:23 -0500 Received: by mail-ej1-x635.google.com with SMTP id hw16so37341333ejc.10 for ; Tue, 24 Jan 2023 01:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=qgCc+ixRFRjg6ugQTW92E+9xgQctGHsw0j24Wb1uiv4=; b=VvLwIjB3KKiGTq3HQItCKvj0vH5DLUAdIndGA22w1PtJzeNiWbeNQwaPQ72Jh2reNb BtHfVhZeyOXnGS+ABHcSEKKe+ovfX4pBazUgn7O1AOCDBMDlmmmRks1UBJB0ZgZyWWPs EXW6/dw46X+vr3dlVqErPONIx1I6aA6P/Ih0q5qhAp57U7MR4ErpRwdoxeJPxCSdRZr4 syatZh91dU/I6XUzJUatitZn+P9fq5XdSUVG5d+GxLBzWHQ8SojWh1n9+lbwxkYPOVb6 u/ggBamICJ5gXsb07HFXflGeROQs0ZW3B2O9Q7yC0vyv/WvIHM7Wtd/5viPMJV3DD0wo o0RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qgCc+ixRFRjg6ugQTW92E+9xgQctGHsw0j24Wb1uiv4=; b=PzQC3EWSYdn33Zhh47xGOs9/NEJOQOYMlwPlAUcwycQvi4ycSeWMilbyQqspyjArcq Cx3E9CWH3lewVpPIcA9s6D9ilszvg3zbTsy0gh7RmYMb/k/e9MOGb9ZLGShO1EGYp99V 3OAVrPIKpGAAwhyNJimpovcEcVQ6X4khZjylGJWrF6JlewgA3QMsWZnZIkNQKi1j8ZiD JA5yfjgwkrdqYMTa4HPqqMm7xJIQME/SINJ7/PYDc6bjUD3SrzHutlWgzkkc2ed+1LJq /NfnM+OD/vJXCX9eh25a8IZbdD0HYxJfKMk6jxQ38GjA8ci0HDIishLESyHltsHfcP0f D6Og== X-Gm-Message-State: AFqh2kpEjG2BSxqxd66kwEEPIypo+KKk9zPXHDe6JTR3g5sG646zuJ2i tn+0kjGjQgtIGPwzB3h42Br0TMwk5VV81Q== X-Google-Smtp-Source: AMrXdXt1j9RmbW2AGqlQB1S3dKBBPFCt8ti6R7Funn/vITFya4ZdKJuqRR3iettG4C/493P0w/ePAg== X-Received: by 2002:a17:907:76c6:b0:877:564a:6fd3 with SMTP id kf6-20020a17090776c600b00877564a6fd3mr24704902ejc.21.1674553339974; Tue, 24 Jan 2023 01:42:19 -0800 (PST) Received: from localhost ([141.226.15.115]) by smtp.gmail.com with ESMTPSA id s23-20020a1709064d9700b0087045ae5935sm656258eju.1.2023.01.24.01.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:42:19 -0800 (PST) From: Efraim Flashner Date: Tue, 24 Jan 2023 11:42:17 +0200 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=efraim.flashner@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.149, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) After looking heavily through the sources I'm of the opinion that zig 0.10.1 doesn't use the new binary bootstrap that they've developed. I'm unsure what to do with $output/bin/zig not finding ld-linux in its RUNPATH, but it's the only thing that's left me unhappy. I wasn't sure if we wanted to keep 0.9 around also, but I didn't want to be responsible for updating zig-zls so I figured we'd keep it for now, especially since they make a point of saying that the language isn't finalized at its 1.0 release yet. Efraim Flashner (2): gnu: zig: Update to 0.10.1. gnu: ncdu: Update to 2.2.2. gnu/packages/ncdu.scm | 6 +-- gnu/packages/zig-xyz.scm | 2 +- gnu/packages/zig.scm | 100 +++++++++++++++++++++++++++++++-------- 3 files changed, 85 insertions(+), 23 deletions(-) base-commit: 5965d74c8ce53d0861af9ad3744844ac925c4a12 -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sat Aug 09 04:59:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61036] [PATCH 1/2] gnu: zig: Update to 0.10.1. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Jan 2023 09:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61036@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 61036-submit@debbugs.gnu.org id=B61036.167455359118467 (code B ref 61036); Tue, 24 Jan 2023 09:47:02 +0000 Received: (at 61036) by debbugs.gnu.org; 24 Jan 2023 09:46:31 +0000 Received: from localhost ([127.0.0.1]:55880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFss-0004nm-A1 for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:46:31 -0500 Received: from mail-ej1-f50.google.com ([209.85.218.50]:34814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFsq-0004nT-5H for 61036@debbugs.gnu.org; Tue, 24 Jan 2023 04:46:28 -0500 Received: by mail-ej1-f50.google.com with SMTP id az20so37503383ejc.1 for <61036@debbugs.gnu.org>; Tue, 24 Jan 2023 01:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=gej+Db6vl0K+XsdwluUR3Nwm8cOalQ/f5yygD/mYWxY=; b=B/hdDWYhD9RssxD0DUr9Oc86jsI7EzVZvgWJaKIrbbaagZKakIAxXX1mVlpiHxME4y b3QfWWgAjzqWOriwhsLBQFAgv5fsyKMCD6k8Tvb5IL/O2Ml64Jrsr5UiMvVfm9nwurVy ggAbPD0H9VeVg+PigltUxNJQdS+cyMAkICpf7CqLB8naGFJ88LyXUcj0RJDBkiM2eGtT R8JHSKB0dLMOeMpai0wWS5hTe1zayGp4QuCwalTzsf0HQoeSuvDOExdJIFFvarxnU07A ajB6kaj1vIt9tY6HI6fOMumrJH71OM7cmaK8XdjSRGNqlWLUxsE5yhhOpYsZGeYdpTvI WYbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gej+Db6vl0K+XsdwluUR3Nwm8cOalQ/f5yygD/mYWxY=; b=2tRarbbPMJjZ05hlRrkriVFmoQJiEZvMC1Lk11YsGzROL/6/Jdqt59/XxBtc3wI53f WOY2MxWuquYIVFnJbalEFYXUevd+h7XoNico6n8rLSJ+ml6qZIrm7qImNoDhM0hopmjl cK6AKRH7zD1sex0OE4NyRAkPv7APnRpsXsEP5ULkQsRv7q6+A8Ys0gmX2NFeDtmDqrBY fhIklnIKSEiSs0xhLvmazQ9vtXDwkFwBGJUv1h6qxpww2iu+3EFmM4Po10o7lwTwezDf fYFA7It9xzhIV/qH5pOBVa+eDXMf3qdUaOP7M6TAcII499I9LgCJqo4TuZOntW/DRzA8 FX4w== X-Gm-Message-State: AFqh2koXWMyVGNZ7KGXoLajnDLmEYyciRpFVNnULo39bsAnFzeEoQCc5 3pd7KkQVRuqcAz6tG1gfMWjaNpKFklBGuQ== X-Google-Smtp-Source: AMrXdXu4fCWf0h/6N/1jEaV2bIIRRvKzTU9TpLjdwSyhqu8pSM6NM5c6TWpvML0CjI2oT6cQxYxlaQ== X-Received: by 2002:a17:907:c606:b0:870:d9a:9ebb with SMTP id ud6-20020a170907c60600b008700d9a9ebbmr26310792ejc.38.1674553581984; Tue, 24 Jan 2023 01:46:21 -0800 (PST) Received: from localhost ([141.226.15.115]) by smtp.gmail.com with ESMTPSA id a23-20020a1709065f9700b0085ff3202ce7sm632931eju.219.2023.01.24.01.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:46:21 -0800 (PST) From: Efraim Flashner Date: Tue, 24 Jan 2023 11:46:18 +0200 Message-Id: <1dee6b1c8526e33669f70550f1a387c9a26930a5.1674553213.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/zig.scm (zig-0.10): New variable. (zig-0.9): Rename from zig-0.9. Inherit from zig-0.10. (zig): Define as zig-0.10. * gnu/packages/ncdu.scm (ncdu)[native-inputs]: Use zig-0.9. * gnu/packages/zig-xyz.scm (zig-zls)[inputs]: Use zig-0.9. --- gnu/packages/ncdu.scm | 2 +- gnu/packages/zig-xyz.scm | 2 +- gnu/packages/zig.scm | 100 +++++++++++++++++++++++++++++++-------- 3 files changed, 83 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index feea8f8819..7e47314351 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -97,7 +97,7 @@ (define-public ncdu (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig)))) + (list perl zig-0.9)))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 3812aa0125..fd42c21638 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -41,7 +41,7 @@ (define-public zig-zls (base32 "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii")))) (build-system gnu-build-system) - (inputs (list zig python)) + (inputs (list zig-0.9 python)) (arguments (list #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index cda93bed2e..b30e691bc5 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Calum Irwin -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,12 +25,14 @@ (define-module (gnu packages zig) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig +(define-public zig-0.10 (package (name "zig") - (version "0.9.1") + (version "0.10.1") (source (origin (method git-fetch) @@ -39,21 +41,25 @@ (define-public zig (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-use-system-paths.patch")))) + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")))) (build-system cmake-build-system) (inputs - (list clang-13 ; Clang propagates llvm. - lld-13)) + (list clang-15 ; Clang propagates llvm. + lld-15 + zlib + (list zstd "lib"))) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs - (list llvm-13)) + (list llvm-15)) (arguments `(#:configure-flags (list ,@(if (%current-target-system) - (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '())) + '(string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system)) + '()) + (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") + "/lib/zig")) + #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. #:out-of-source? #f ; for tests #:phases (modify-phases %standard-phases @@ -62,17 +68,20 @@ (define-public zig ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. (setenv "ZIG_GLOBAL_CACHE_DIR" (string-append (getcwd) "/zig-cache")))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) (delete 'check) (add-after 'install 'check (lambda* (#:key outputs tests? #:allow-other-keys) (when tests? (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - ;; and stage 2 tests require a lot of RAM. + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" "-Dskip-stage2-tests" ;; Non-native tests try to link and execute non-native ;; binaries. @@ -100,7 +109,60 @@ (define-public zig @item concurrency via async functions. @end itemize") (home-page "https://github.com/ziglang/zig") + (license license:expat))) + +(define-public zig-0.9 + (package + (inherit zig-0.10) + (name "zig") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglang/zig.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) + (patches (search-patches "zig-use-system-paths.patch")))) + (inputs + (list clang-13 ; Clang propagates llvm. + lld-13)) + ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (native-inputs + (list llvm-13)) + (arguments + `(#:configure-flags + (list ,@(if (%current-target-system) + (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system)) + '())) + #:out-of-source? #f ; for tests + #:phases + (modify-phases %standard-phases + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (invoke (string-append (assoc-ref outputs "out") "/bin/zig") + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + ;; and stage 2 tests require a lot of RAM. + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))) ;; Currently building zig can take up to 10GB of RAM for linking stage1: ;; https://github.com/ziglang/zig/issues/6485 - (supported-systems %64bit-supported-systems) - (license license:expat))) + (supported-systems %64bit-supported-systems))) + +(define-public zig zig-0.10) -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sat Aug 09 04:59:44 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61036] [PATCH 2/2] gnu: ncdu: Update to 2.2.2. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Jan 2023 09:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61036@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 61036-submit@debbugs.gnu.org id=B61036.167455359418482 (code B ref 61036); Tue, 24 Jan 2023 09:47:02 +0000 Received: (at 61036) by debbugs.gnu.org; 24 Jan 2023 09:46:34 +0000 Received: from localhost ([127.0.0.1]:55883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFsw-0004o2-66 for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:46:34 -0500 Received: from mail-ej1-f54.google.com ([209.85.218.54]:46738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFss-0004nZ-FO for 61036@debbugs.gnu.org; Tue, 24 Jan 2023 04:46:31 -0500 Received: by mail-ej1-f54.google.com with SMTP id qx13so37338601ejb.13 for <61036@debbugs.gnu.org>; Tue, 24 Jan 2023 01:46:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=V3LkRBt5rzM6F2KuWeJDvm75PpfrSAi423pGkyrw/eo=; b=eu4S6ropS+dJY05aHt3DaBRwHdu5OyV9xAdvZSKWaUeKzNNj/vtMm3ZyRIwb6CacK/ 2QgZJNSJLn5V89aXmwooHFC9DS10lbUAFcg2lm8H+cIjZj/e6Ouo0TUO/WDpBSPFLIR0 FPOjWNcEPMrIoqp2OOQcFFG6BcVB78FBGNOg05i/bYfur5NB3O0Gr52UATtkoD+42Vyz O/enajC5O+KomwRHPTyzKO4DPocZ+aZrfcN3+HS1jAEKJBNqyFt/JEyFuBrgkU7t6TqK 625FOOYiWDiXgDcL/b0HOdmSmV8VW99pud1+i1Jd32hp04s8m43RKlygystJlcmfUUGe /xoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=V3LkRBt5rzM6F2KuWeJDvm75PpfrSAi423pGkyrw/eo=; b=veBpV8AJCWNOtMNZ3tvqeRQjLdnhAcddpo9FYtq1ZprCSHu4y5yb8nrQJwMqMAG9TM w+xfdKEhIF/akIsc6687FN9auba4BqtC+TpF6cIVbcQHj/SH2Y90gcZRbLxhL58mDYXu w2tJ/Z0rzaqGvlDbgFlPx+ATJSnF5bjQ9NEYz3lUrjSGdI8Hxj6zkzHlVwNCN6Cwi70F EuP5YW7/3cU0iJ87MkpcFX2mVgcBgXlP5W0myhYbbhXAf3bmtLJ5EVziiq11hWbbXb6f 4tQNe8NFFs6TpO6KbN6HAfAoz855bCy9flTtI8yjw8SMcYEneaYZuopbfL33kUrL2Pqo mjVQ== X-Gm-Message-State: AFqh2kofN/M6b0FP7BX4EIhkCgVT7ROtvA+37DDXuIfJKU1cEOq4PpVa Doy3/tVt0p7lA3vAXHWfUf9vGqme58YrBw== X-Google-Smtp-Source: AMrXdXu/l2tiRy1OI2enQCaKooMBI3/ynZ2tYE8q11/z3hOpdT/saZxYc4G0st9NBviOFcf9gGHYIA== X-Received: by 2002:a17:906:1995:b0:871:32e7:79ac with SMTP id g21-20020a170906199500b0087132e779acmr27053504ejd.5.1674553584723; Tue, 24 Jan 2023 01:46:24 -0800 (PST) Received: from localhost ([141.226.15.115]) by smtp.gmail.com with ESMTPSA id qc26-20020a170906d8ba00b00877a351cedcsm647403ejb.110.2023.01.24.01.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:46:24 -0800 (PST) From: Efraim Flashner Date: Tue, 24 Jan 2023 11:46:19 +0200 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/ncdu.scm (ncdu): Update to 2.2.2. [native-inputs]: Switch from zig-0.9 to zig. --- gnu/packages/ncdu.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 7e47314351..39cf48273e 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,14 +62,14 @@ (define-public ncdu (package (inherit ncdu-1) (name "ncdu") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0hfimrr7z9zrfkiyj09i8nh4a1rjn7d00y9xzpc7mkyqpkvghjjy")) + "14zrmcxnrczamqjrib99jga05ixk0dzfav3pd6s1h8vm9q121nch")) (modules '((guix build utils))) (snippet #~(begin @@ -97,7 +97,7 @@ (define-public ncdu (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig-0.9)))) + (list perl zig)))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted From unknown Sat Aug 09 04:59:44 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Efraim Flashner Subject: bug#61036: closed (Re: [PATCH 1/2] gnu: zig: Update to 0.10.1.) Message-ID: References: X-Gnu-PR-Message: they-closed 61036 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 61036@debbugs.gnu.org Date: Tue, 06 Jun 2023 05:58:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1686031082-4069-1" This is a multi-part message in MIME format... ------------=_1686031082-4069-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #61036: [PATCH 0/3] Update zig to 0.10.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 61036@debbugs.gnu.org. --=20 61036: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D61036 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1686031082-4069-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 61036-done) by debbugs.gnu.org; 6 Jun 2023 05:57:13 +0000 Received: from localhost ([127.0.0.1]:50696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Pgv-00012Z-7H for submit@debbugs.gnu.org; Tue, 06 Jun 2023 01:57:13 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:50547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Pgt-00012M-G8 for 61036-done@debbugs.gnu.org; Tue, 06 Jun 2023 01:57:12 -0400 Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-30aef0b8837so4642563f8f.1 for <61036-done@debbugs.gnu.org>; Mon, 05 Jun 2023 22:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686031025; x=1688623025; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:sender:from:to:cc :subject:date:message-id:reply-to; bh=Q8dsTLiNcKWlreaz9JWcol8+s163oNqJok1d7nITKNo=; b=dFfB3KUULB5j2KUzc/xxL8Li1c9QA8zN4DwxYIXWh0WwMM8xECMvtBZv/dIvztvh7/ c5yYczi8QCVSB0bZEMC5jU0ybBhJ+RvXqnqc/Y+IsniC+81x8gHzy6tglddRF4lvZjBZ l3q4ddQPIMg3WlgAWBYh6oce8OjENVvCXa0C0q5pS59mnJoVvJCCg/aKfTTd34eJizIP vXFbSYiNeXttca7feCU7hAcrKT4brWXmvcD0mXJbdl/paIPhGl2CW46rM7N5J9916JeW /cRgRF05V2XGCATEE1vGTD5B11bsr+p9P2SYywMk+qUsgziqD+VVSOMZd4AYIIISBlK3 mnog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686031025; x=1688623025; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Q8dsTLiNcKWlreaz9JWcol8+s163oNqJok1d7nITKNo=; b=khPCsYH2rWBt3bKH8LcaSX2MBjIS0G4ID6TADISx3sWtLEDTtiidSPq6qi1IbP21lY 0NEPZTbR5KcGqh8l1AsuhMRQlOBVBtGMrwJ5nPF/Nfxgg5IkWrNx6FsWtSUejkup02ql TSV0XhHStVQ4sQzD13BZ1cKZIh4Iyj6hpJTwq4Y5FBvefECSWO8FzoHYnlWm3G2AI9qT DPKF5nKW8TOfvzWawr0/Yl7xzCmEys6IJL4rQIKJ0fBPhecT0adJmQkHcPQroGAlG9Vs SM4ZonGuuVoJJOV1ThT2HtmhKUAwVGt6Mlu7AhK/eY1sZycu1xgFlK5rHyQJ9Vphj/rE IU0w== X-Gm-Message-State: AC+VfDybR+N8hcftsojiOOzWO6xc4oQ3PHPTSsXYZfrVfVqaGPdX5Gpn XQtlIPoiWGQPfbNidn0wJH+4tT1njeGf4A== X-Google-Smtp-Source: ACHHUZ6Hr63sSQN1/v/0145lCKySXdv8qCtiGdiFa4Gg7N55f+SngV2r/a85+Jh5b/NZm8n5kjhIug== X-Received: by 2002:adf:f14f:0:b0:30a:eb3f:509f with SMTP id y15-20020adff14f000000b0030aeb3f509fmr705418wro.60.1686031025194; Mon, 05 Jun 2023 22:57:05 -0700 (PDT) Received: from localhost ([37.46.46.3]) by smtp.gmail.com with ESMTPSA id j14-20020adff54e000000b0030aec5e020fsm11536236wrp.86.2023.06.05.22.57.04 for <61036-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 22:57:04 -0700 (PDT) Date: Tue, 6 Jun 2023 08:57:03 +0300 From: Efraim Flashner To: 61036-done@debbugs.gnu.org Subject: Re: [PATCH 1/2] gnu: zig: Update to 0.10.1. Message-ID: Mail-Followup-To: Efraim Flashner , 61036-done@debbugs.gnu.org References: <1dee6b1c8526e33669f70550f1a387c9a26930a5.1674553213.git.efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="egft18ADQSRR9m3D" Content-Disposition: inline In-Reply-To: <1dee6b1c8526e33669f70550f1a387c9a26930a5.1674553213.git.efraim@flashner.co.il> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 61036-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --egft18ADQSRR9m3D Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch was pushed a few months ago. Closing! --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --egft18ADQSRR9m3D Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmR+yq8ACgkQQarn3Mo9 g1GZARAAjTJnJ2uGcHKI/qGFQ0qirjblKWbNqn25e7p1HUC4uQ9cEpqg/v8CazBY FMlCYAo8RZqF3cpjD3WqxCvdZz4sgsbgZWt3NirRYnXYiEdz8xM4Dbj0PMaEWiMf JaRq1eOlZ9HMo7EirS2ky68HAuUHYuzjqGHeac9IxzagG5FgMX+3hZMSAG48WENd QreO9+H29wElX7/02NnSBIn/clrgiPQaeZaSORka0dX6rvhbIyYiQpyh9lsauNIn VIRP9JKnEzjtdFchBke1HpMc1XsPevJYlYyxHHXe6NkHq6UV8RIR3biLjypRJ+bb VXSsIK/6ZzCynMmxuC0Wv2yfcicyZVO12yIY9+JxipEd7jz6HNQhHVw9pwyFDPYN RiGyrZe+0b53NKKwgfTK0JYqcw20SVzjhGaOWKIexDQ9VL0GRdI6Mc1wwBpk6Qa0 1Q0G6robs+dD1iAM5Rge3hBAwVTP8Tp3y1kTYC0KgQYEkRK+rYJfHBvIF9EgNTOa ZUbzqft5xEzwp5mLmjb9vmw5y7hyIllzioQnOvPwSYvxrDBgEfEHDGoJ1gFyDTbE HysA1lKlgx0jpN3Xo+FrbSWajyu/fl8sMANpoZWhpB7dUWoO6eqMA6/D5NJJEVCQ AGCyy4FPc5fo+KwhDsGEOWboVddz5J+Z8rhAAbAAI6GGw7KAHdk= =WFIE -----END PGP SIGNATURE----- --egft18ADQSRR9m3D-- ------------=_1686031082-4069-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 24 Jan 2023 09:42:25 +0000 Received: from localhost ([127.0.0.1]:55875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFou-0004gZ-Jy for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:42:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:37898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKFot-0004gS-SQ for submit@debbugs.gnu.org; Tue, 24 Jan 2023 04:42:24 -0500 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 1pKFot-0005Ht-Iz for guix-patches@gnu.org; Tue, 24 Jan 2023 04:42:23 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pKFor-00037R-LD for guix-patches@gnu.org; Tue, 24 Jan 2023 04:42:23 -0500 Received: by mail-ej1-x635.google.com with SMTP id hw16so37341333ejc.10 for ; Tue, 24 Jan 2023 01:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=qgCc+ixRFRjg6ugQTW92E+9xgQctGHsw0j24Wb1uiv4=; b=VvLwIjB3KKiGTq3HQItCKvj0vH5DLUAdIndGA22w1PtJzeNiWbeNQwaPQ72Jh2reNb BtHfVhZeyOXnGS+ABHcSEKKe+ovfX4pBazUgn7O1AOCDBMDlmmmRks1UBJB0ZgZyWWPs EXW6/dw46X+vr3dlVqErPONIx1I6aA6P/Ih0q5qhAp57U7MR4ErpRwdoxeJPxCSdRZr4 syatZh91dU/I6XUzJUatitZn+P9fq5XdSUVG5d+GxLBzWHQ8SojWh1n9+lbwxkYPOVb6 u/ggBamICJ5gXsb07HFXflGeROQs0ZW3B2O9Q7yC0vyv/WvIHM7Wtd/5viPMJV3DD0wo o0RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qgCc+ixRFRjg6ugQTW92E+9xgQctGHsw0j24Wb1uiv4=; b=PzQC3EWSYdn33Zhh47xGOs9/NEJOQOYMlwPlAUcwycQvi4ycSeWMilbyQqspyjArcq Cx3E9CWH3lewVpPIcA9s6D9ilszvg3zbTsy0gh7RmYMb/k/e9MOGb9ZLGShO1EGYp99V 3OAVrPIKpGAAwhyNJimpovcEcVQ6X4khZjylGJWrF6JlewgA3QMsWZnZIkNQKi1j8ZiD JA5yfjgwkrdqYMTa4HPqqMm7xJIQME/SINJ7/PYDc6bjUD3SrzHutlWgzkkc2ed+1LJq /NfnM+OD/vJXCX9eh25a8IZbdD0HYxJfKMk6jxQ38GjA8ci0HDIishLESyHltsHfcP0f D6Og== X-Gm-Message-State: AFqh2kpEjG2BSxqxd66kwEEPIypo+KKk9zPXHDe6JTR3g5sG646zuJ2i tn+0kjGjQgtIGPwzB3h42Br0TMwk5VV81Q== X-Google-Smtp-Source: AMrXdXt1j9RmbW2AGqlQB1S3dKBBPFCt8ti6R7Funn/vITFya4ZdKJuqRR3iettG4C/493P0w/ePAg== X-Received: by 2002:a17:907:76c6:b0:877:564a:6fd3 with SMTP id kf6-20020a17090776c600b00877564a6fd3mr24704902ejc.21.1674553339974; Tue, 24 Jan 2023 01:42:19 -0800 (PST) Received: from localhost ([141.226.15.115]) by smtp.gmail.com with ESMTPSA id s23-20020a1709064d9700b0087045ae5935sm656258eju.1.2023.01.24.01.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:42:19 -0800 (PST) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH 0/3] Update zig to 0.10.1 Date: Tue, 24 Jan 2023 11:42:17 +0200 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=efraim.flashner@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.149, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) After looking heavily through the sources I'm of the opinion that zig 0.10.1 doesn't use the new binary bootstrap that they've developed. I'm unsure what to do with $output/bin/zig not finding ld-linux in its RUNPATH, but it's the only thing that's left me unhappy. I wasn't sure if we wanted to keep 0.9 around also, but I didn't want to be responsible for updating zig-zls so I figured we'd keep it for now, especially since they make a point of saying that the language isn't finalized at its 1.0 release yet. Efraim Flashner (2): gnu: zig: Update to 0.10.1. gnu: ncdu: Update to 2.2.2. gnu/packages/ncdu.scm | 6 +-- gnu/packages/zig-xyz.scm | 2 +- gnu/packages/zig.scm | 100 +++++++++++++++++++++++++++++++-------- 3 files changed, 85 insertions(+), 23 deletions(-) base-commit: 5965d74c8ce53d0861af9ad3744844ac925c4a12 -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted ------------=_1686031082-4069-1--