From 50c22dff0e7bda39794e965ade4efc15c0499259 Mon Sep 17 00:00:00 2001 From: Anton Steketee <79179784+anton-seaice@users.noreply.github.com> Date: Fri, 28 Nov 2025 15:13:15 +1100 Subject: [PATCH 1/5] Less restrictive target for `gh` --- gh/spack.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gh/spack.yaml b/gh/spack.yaml index 69a35e0..ae24f7a 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -11,6 +11,9 @@ spack: gh: require: - '%gcc@14.1.0' + all: + require: + - 'target=x86_64' view: true concretizer: unify: true From a19608f886a3075748174021367a1491f11f48ab Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Tue, 9 Dec 2025 16:04:37 +1100 Subject: [PATCH 2/5] all: require: - 'target=x86_64' --- ncdu/spack.yaml | 3 +++ openssh/spack.yaml | 3 +++ pinentry/spack.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index 878b108..fff7c8d 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -11,6 +11,9 @@ spack: ncdu: require: - '%gcc@14.1.0' + all: + require: + - 'target=x86_64' view: true concretizer: unify: true diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 179fcd1..deb2b22 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -11,6 +11,9 @@ spack: openssh: require: - '%gcc@14.1.0' + all: + require: + - 'target=x86_64' view: true concretizer: unify: true diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index c69e3d5..a060735 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -11,6 +11,9 @@ spack: pinentry: require: - '%gcc@14.1.0' + all: + require: + - 'target=x86_64' view: true concretizer: unify: true From 8471ecd938ebbc8da30e1d1b03a99103eb288216 Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Thu, 11 Dec 2025 10:48:46 +1100 Subject: [PATCH 3/5] Revert " all:" This reverts commit a19608f886a3075748174021367a1491f11f48ab. --- ncdu/spack.yaml | 3 --- openssh/spack.yaml | 3 --- pinentry/spack.yaml | 3 --- 3 files changed, 9 deletions(-) diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index fff7c8d..878b108 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -11,9 +11,6 @@ spack: ncdu: require: - '%gcc@14.1.0' - all: - require: - - 'target=x86_64' view: true concretizer: unify: true diff --git a/openssh/spack.yaml b/openssh/spack.yaml index deb2b22..179fcd1 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -11,9 +11,6 @@ spack: openssh: require: - '%gcc@14.1.0' - all: - require: - - 'target=x86_64' view: true concretizer: unify: true diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index a060735..c69e3d5 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -11,9 +11,6 @@ spack: pinentry: require: - '%gcc@14.1.0' - all: - require: - - 'target=x86_64' view: true concretizer: unify: true From 8639943071ecce0720c5a2d8c2372d4aa69d5c9a Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Thu, 11 Dec 2025 10:50:09 +1100 Subject: [PATCH 4/5] Use new versions to avoid name conflicts in deployment --- gh/spack.yaml | 2 +- openssh/spack.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index ae24f7a..9ea5685 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -6,7 +6,7 @@ # This manifest is for installing gh, the GitHub command line interface spack: specs: - - gh@2.43.1 + - gh@2.49.2 packages: gh: require: diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 179fcd1..603db6c 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -6,11 +6,14 @@ # This manifest is for installing openssh, a suite of secure networking utilities based on the SSH protocol spack: specs: - - openssh@9.8p1 + - openssh@9.9p1 packages: openssh: require: - '%gcc@14.1.0' + all: + require: + - 'target=x86_64' view: true concretizer: unify: true From aa771b0219c0886dacd39cab36de341bbce0f339 Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Thu, 11 Dec 2025 12:21:51 +1100 Subject: [PATCH 5/5] fix version ? --- gh/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index 9ea5685..ccd0491 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -23,4 +23,4 @@ spack: include: - gh projections: - gh: 'system-tools/{name}/2.43.1' + gh: 'system-tools/{name}/{version}'