From patchwork Mon May 5 18:03:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 42336 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 1885C27BC4A; Mon, 5 May 2025 19:06:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C951027BC49 for ; Mon, 5 May 2025 19:06:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uC0Cb-0005at-7A; Mon, 05 May 2025 14:06: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 1uC0Bt-0005QY-7B for guix-patches@gnu.org; Mon, 05 May 2025 14:05:21 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uC0Bs-0002DH-0l for guix-patches@gnu.org; Mon, 05 May 2025 14:05:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=mNDWx94txhA2liyygrEGf1PcM77SnlDEaAov90KcONA=; b=ZgLfVacKTYcu4MSQPFlzG0wn/GrNY6VaMeBhZkjFRTZCaFCWDmExj0ZCzsw/lHl1Vg150Om8GA06UDdh/0GF8QCe5SXIcyOVg0Z+VH/5k40emisI3DGHeBM89TFW5/wMDHkduLG8/KdPTm5bsoVaMW//f8TUHIuTM1enqRC+NW3+8Y9bdyn1PUTaWjYkkHOXM1MGjU4UO/u41PdgDNpv6myJjPNdhvFEZ7nOxItUnm/a9o7b/sU2/HxkbQR6RkFKFoThc/cLoW/KKo684Xx5eanOM4vWBp53KQBezTKVHlNdkPOCfi5msD3oGeERfVY/OvI91+tKuV0rGuidVZj3gw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uC0BZ-0000A7-TF; Mon, 05 May 2025 14:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78266] [PATCH 1/1] gnu: Rename valgrind-next to valgrind. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, divya@subvertising.org, efraim@flashner.co.il, gabriel@erlikon.ch, code@greghogan.com, hako@ultrarare.space, leo@famulari.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, sharlatanus@gmail.com, steve@futurile.net, vagrant@debian.org, vivien@planete-kraus.eu, w@wmeyer.eu, z572@z572.online, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 05 May 2025 18:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78266 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78266@debbugs.gnu.org Cc: Greg Hogan , Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Gabriel Wicki , Greg Hogan , Hilton Chain , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , =?utf-8?q?No=C3=A9?= Lopez , Sharlatan Hellseher , Steve George , Vagrant Cascadian , Vivien Kraus , Wilko Meyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Christopher Baines , Divya Ranjan Pattanaik , Efraim Flashner , Gabriel Wicki , Greg Hogan , Hilton Chain , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , =?utf-8?q?No=C3=A9?= Lopez , Sharlatan Hellseher , Steve George , Vagrant Cascadian , Vivien Kraus , Wilko Meyer , Zheng Junjie , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 78266-submit@debbugs.gnu.org id=B78266.1746468248504 (code B ref 78266); Mon, 05 May 2025 18:05:01 +0000 Received: (at 78266) by debbugs.gnu.org; 5 May 2025 18:04:08 +0000 Received: from localhost ([127.0.0.1]:42719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uC0Ah-000082-CD for submit@debbugs.gnu.org; Mon, 05 May 2025 14:04:08 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:53527) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uC0Ae-00007K-A3 for 78266@debbugs.gnu.org; Mon, 05 May 2025 14:04:05 -0400 Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-476ae781d21so55975091cf.3 for <78266@debbugs.gnu.org>; Mon, 05 May 2025 11:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1746468238; x=1747073038; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mNDWx94txhA2liyygrEGf1PcM77SnlDEaAov90KcONA=; b=0BVHd0qFGHiFz7fDL7IBvkcNmRoaTGuSA4idcnKmu+StXkD5slTc/CxTyC/LRpO2ip nJtNcK+ZUGLAkk4AljutLtmp3gpOKUJWZQh6YPP0barlUQ/6riFSTNj0jJNTc1YzNaa4 EJ5jccIiIW32aoabYsgMR978kK+j+UaZQZgGDd627k8D5gcTAf8oO0BIDNGmF8yuPc6q CLuGNZm0NJoem7u0N204GQ2mBC1+/Qeo9LlJvht0q72e3PFrCxwvzFysBxaR+137APlp 6plbTp23qURzCQMHBsYAeXYoIg+P/8qjKwynXtC7Eh9vd5b576GDkQuJWnHIg/yukJ/5 Uosg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746468238; x=1747073038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mNDWx94txhA2liyygrEGf1PcM77SnlDEaAov90KcONA=; b=lMLEapT4Z02wOFWMydZdS0uhVTqvqsJWLNjpPVEnVbs6RgJksBl6ajVxW3n0lj2lOl Ts4vzI+Ff+wWbL1FHK8KDXC1n3IE7lAz7RMpAU2SLe5F5F3TQRWdw6BB22rwiFxOcY0d RhL4M61S57TJKkxu/iRbpIdmwNR9dDU4iq9s32RqZroY/1aFAmcP3+S7+LBFcx7IxthL EgWKpFrQ2UYo3dhEQnL/IUESXbV6KRJJopY4XKpbtPnQpcireMJOpr3rrUuAKRrm7cgQ ZyVSZxYZdjqY6xU5VyHyCUs/+5XJjn11Zqt5VHkEA9nyl8WXEJ8FsXhBfD6TTcCSnAT0 7NIQ== X-Gm-Message-State: AOJu0YyuJY43XIHWx/XGhymbSBMV5pgpoOZYK5MAep3HQ0UiUQI2wKtf QxpOg4lQldbZ6qXUr05ZMC6iVtIUFKSxxadm6WMz/NIAmfvPqEMMGVYguDcloZCKgQkFfrMmsxq O X-Gm-Gg: ASbGncvGmuX6M6xMXnOijgo+mMEcHHZY9pd7cr+VnTOV2dm/0+BJSS2ZQaLF/ynjQ+2 F9PbH6kpCDB9XotupyUXGgGIWqhi4A5Zcr4tvqmIq+vErn6l6KchwO5wG7v1M/ZJcb/QEX69jQu +hs/o2tjhYdRMK9tLmwYjsDbmODljXtco1BiMN4aqomgM0670iqwsaQg7fhE1Ylg9jcC7bJC9I1 DNZ1Z1e4cbDY5fdhNJDQdk5O+ad2dmus8yy6fv3T6JjKiAfQlOVY/K6GWoQq1/zr33poufo4P/o V7EkGBvgVebu7+O6XssgH/6qp/gbKDuO9nUNSsQ5pJJlQt5SR98WtZh6mp7sz8d4HjtYemdaMjv pi181G+VX7AJglJkfEbeX0fTIiM91HRuIvasYAZzG X-Google-Smtp-Source: AGHT+IEIu3Zyx/3nbu6QXZrqAS+NktU22uKD7KG8v7bd4cflT1N1sOVq13ue/J6zIPcdFBhtA52ySg== X-Received: by 2002:a05:622a:9:b0:476:6189:4f40 with SMTP id d75a77b69052e-490f325d3f4mr2409051cf.45.1746468238155; Mon, 05 May 2025 11:03:58 -0700 (PDT) Received: from ip-10-117-149-49.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-48b98d0ef33sm60879171cf.74.2025.05.05.11.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:03:57 -0700 (PDT) From: Greg Hogan Date: Mon, 5 May 2025 18:03:53 +0000 Message-ID: <4b2942d0c7abf5532e30362e8aa419057960d6d9.1746467671.git.code@greghogan.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/valgrind.scm (valgrind/pinned): Make public. (valgrind): Delete alias. (valgrind-next): Rename to valgrind. (valgrind/interactive): Inherit from valgrind. * gnu/packages/audio.scm (codec2), * gnu/packages/bootloaders.scm (dtc), * gnu/packages/chromium.scm (ungoogled-chromium), * gnu/packages/crates-io.scm (rust-crabgrind-0.1), * gnu/packages/crates-tls.scm (rust-rustls-pki-types-1), * gnu/packages/file-systems.scm (bindfs), * gnu/packages/gnome.scm (libratbag, gnome-software), * gnu/packages/high-availability.scm (pacemaker), * gnu/packages/linux.scm (multipath-tools), * gnu/packages/machine-learning.scm (python-pytorch), * gnu/packages/mpi.scm (openmpi-4), * gnu/packages/music.scm (stargate), * gnu/packages/perl-check.scm (perl-test-runvalgrind), * gnu/packages/prolog.scm (trealla), * gnu/packages/qt.scm (qtwebengine-5, qt-creator), * gnu/packages/robotics.scm (aseba), * gnu/packages/ruby.scm (ruby-ruby-memcheck), * gnu/packages/spreadsheet.scm (sc-im), * gnu/packages/web.scm (jq): Rename valgrind to valgrind/pinned. Change-Id: I9dec25abce643ef6d815a2cc50414c4f65f1e8d3 --- gnu/packages/audio.scm | 2 +- gnu/packages/bootloaders.scm | 4 ++-- gnu/packages/chromium.scm | 2 +- gnu/packages/crates-io.scm | 2 +- gnu/packages/crates-tls.scm | 2 +- gnu/packages/file-systems.scm | 2 +- gnu/packages/gnome.scm | 6 +++--- gnu/packages/high-availability.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/machine-learning.scm | 2 +- gnu/packages/mpi.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/perl-check.scm | 2 +- gnu/packages/prolog.scm | 4 ++-- gnu/packages/qt.scm | 4 ++-- gnu/packages/robotics.scm | 2 +- gnu/packages/ruby.scm | 2 +- gnu/packages/spreadsheet.scm | 2 +- gnu/packages/valgrind.scm | 8 +++----- gnu/packages/web.scm | 4 ++-- 20 files changed, 28 insertions(+), 30 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f9daf07521..7bef131f98 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6514,7 +6514,7 @@ (define-public codec2 (base32 "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba")))) (build-system cmake-build-system) (native-inputs - (list bc octave valgrind)) + (list bc octave valgrind/pinned)) (arguments `(#:tests? #f ; TODO: Fix tests (paths, graphic toolkit, octave modules). #:phases diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8ece61f11c..44b27d8a96 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -742,8 +742,8 @@ (define-public dtc python-setuptools-scm swig which) - (if (member (%current-system) (package-supported-systems valgrind)) - (list valgrind) + (if (member (%current-system) (package-supported-systems valgrind/pinned)) + (list valgrind/pinned) '()))) (inputs (list python)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 5da5f10da6..407cb41edc 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -924,7 +924,7 @@ (define-public ungoogled-chromium snappy speech-dispatcher eudev - valgrind + valgrind/pinned vulkan-headers vulkan-loader wayland diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index edd4466154..20fa86827d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16325,7 +16325,7 @@ (define-public rust-crabgrind-0.1 "--skip=tests::test_run_mode_under_valgrind" "--skip=tests::wrong_monitor_command") #:cargo-inputs (("rust-cc" ,rust-cc-1)))) - (inputs (list valgrind)) + (inputs (list valgrind/pinned)) (home-page "https://github.com/2dav/crabgrind") (synopsis "Rust bindings to \"Valgrind Client Request\" interface") (description diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 40b013d720..9b147b102e 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -1763,7 +1763,7 @@ (define-public rust-rustls-pki-types-1 (arguments `(#:cargo-inputs (("rust-web-time" ,rust-web-time-1)) #:cargo-development-inputs (("rust-crabgrind" ,rust-crabgrind-0.1)))) - (native-inputs (list valgrind)) + (native-inputs (list valgrind/pinned)) (home-page "https://github.com/rustls/pki-types") (synopsis "Shared types for the rustls PKI ecosystem") (description diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a21679b954..4b9ff74387 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -219,7 +219,7 @@ (define-public bindfs (native-inputs ;; Native inputs to run the tests ;; ("ruby" ,ruby) - ;; ("valgrind" ,valgrind) + ;; ("valgrind" ,valgrind/pinned) ;; ("which" ,which) (list pkg-config)) (inputs diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 86481705bb..d03e829b24 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13292,8 +13292,8 @@ (define-public libratbag (native-inputs (append (list check pkg-config swig) - (if (member (%current-system) (package-supported-systems valgrind)) - (list valgrind) + (if (member (%current-system) (package-supported-systems valgrind/pinned)) + (list valgrind/pinned) '()))) (inputs `(("bash" ,bash-minimal) ; for wrap-program @@ -14627,7 +14627,7 @@ (define-public gnome-software libxslt ;for xsltproc pkg-config sysprof - valgrind)) + valgrind/pinned)) (inputs (list appstream flatpak diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 2799b5097d..b610e8791e 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -414,7 +414,7 @@ (define-public pacemaker pkg-config rsync util-linux - valgrind)) + valgrind/pinned)) (inputs (list dbus corosync glib diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5903d4e7c1..e5606dcd06 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6475,7 +6475,7 @@ (define-public multipath-tools (string-append "-Wl,-rpath=" #$output "/lib"))))))) (native-inputs - (list perl pkg-config valgrind + (list perl pkg-config valgrind/pinned ;; For tests. cmocka)) (inputs diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 94b230eb6e..837aa02efa 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5244,7 +5244,7 @@ (define-public python-pytorch python-hypothesis python-types-dataclasses shaderc - valgrind)) + valgrind/pinned)) (inputs (append (list asmjit diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index c162cf50e6..9a7cffde19 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -231,7 +231,7 @@ (define-public openmpi-4 (if-supported psm) (if-supported psm2) (if-supported ucx) - (if-supported valgrind) + (if-supported valgrind/pinned) (list rdma-core slurm)))) ;for PMI support (launching via "srun") (native-inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fae597ec99..e1ccc2fb68 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5370,7 +5370,7 @@ (define-public stargate python-wavefile python-yq rubberband - valgrind + valgrind/pinned stargate-sbsms stargate-soundtouch)) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 8a0c64884e..8fc434a29e 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1409,7 +1409,7 @@ (define-public perl-test-runvalgrind (native-inputs (list perl-module-build)) (propagated-inputs - (list perl-path-tiny perl-test-trap valgrind)) + (list perl-path-tiny perl-test-trap valgrind/pinned)) (home-page "https://metacpan.org/release/Test-RunValgrind") (synopsis "Tests that an external program is valgrind-clean") (description "Test::RunValgind checks weather Valgrind does not detect diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index c8b35200e5..7db0c8018b 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -196,8 +196,8 @@ (define-public trealla (build-system gnu-build-system) (native-inputs (append - (if (supported-package? valgrind) - (list valgrind) + (if (supported-package? valgrind/pinned) + (list valgrind/pinned) '()) (list xxd))) (inputs diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c491b5536d..f0803b5568 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3390,7 +3390,7 @@ (define-public qtwebengine-5 re2 snappy eudev - valgrind + valgrind/pinned vulkan-headers xcb-util)) (propagated-inputs @@ -6163,7 +6163,7 @@ (define-public qt-creator qtshadertools qtsvg yaml-cpp - valgrind + valgrind/pinned vulkan-loader `(,zstd "lib")) (if (supported-package? rust-rustc-demangle-capi-0.1) diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 949978d5dd..f95aa2b325 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -111,7 +111,7 @@ (define-public aseba debug " " flag))))))))) (native-inputs (list pkg-config - valgrind ;for tests + valgrind/pinned ;for tests `(,(canonical-package glibc) "debug"))) (inputs (list dashel diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 24407fbd58..840c0f52c7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10209,7 +10209,7 @@ (define-public ruby-ruby-memcheck (("%x\\(git ls-files -z)") "`git ls-files -z`"))))))) (native-inputs (list ruby-rake-compiler ruby-rspec)) - (inputs (list valgrind)) + (inputs (list valgrind/pinned)) (propagated-inputs (list ruby-nokogiri)) (synopsis "Valgrind memcheck tool for Ruby") (description "The @code{ruby_memcheck} gem provides a sane way to use diff --git a/gnu/packages/spreadsheet.scm b/gnu/packages/spreadsheet.scm index 194d4f637e..bb424a4d52 100644 --- a/gnu/packages/spreadsheet.scm +++ b/gnu/packages/spreadsheet.scm @@ -87,7 +87,7 @@ (define-public sc-im (list bash-minimal bison pkg-config - valgrind + valgrind/pinned which)) (synopsis "Spreadsheet program with vim-like keybindings") (description diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 1cdbcf1689..b00a6445f8 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -37,7 +37,7 @@ (define-module (gnu packages valgrind) #:use-module (gnu packages gdb) #:use-module (gnu packages perl)) -(define valgrind/pinned +(define-public valgrind/pinned (package (name "valgrind") (version "3.22.0") @@ -93,7 +93,7 @@ (define valgrind/pinned ;; Hide this variant so end users get the "interactive" Valgrind below. (properties '((hidden? . #t))))) -(define-public valgrind-next +(define-public valgrind (package (inherit valgrind/pinned) (version "3.25.0") @@ -110,10 +110,8 @@ (define-public valgrind-next '("i586-gnu" "x86_64-gnu" "armhf-linux"))))) -(define-public valgrind valgrind/pinned) - (define-public valgrind/interactive - (package/inherit valgrind-next + (package/inherit valgrind (inputs ;; GDB is needed to provide a sane default for `--db-command'. (list gdb `(,(canonical-package (libc-for-target)) "debug"))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b3f998aca9..27954b67a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5597,8 +5597,8 @@ (define-public jq ;(list ruby bundler) '() (if (member (%current-system) - (package-supported-systems valgrind)) - (list valgrind) + (package-supported-systems valgrind/pinned)) + (list valgrind/pinned) '()))) (build-system gnu-build-system) (home-page "https://jqlang.github.io/jq/")