From 3abe2dd8d1f3a44398524606af4d2d44940e7349 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Tue, 23 Dec 2025 14:21:28 +1100 Subject: [PATCH 1/2] Update the compiler from gcc@14.1.0 to gcc@15.1.0 and target * This will allow us to remove gcc@14.1.0 from our spack-config since we already have gcc@14.2.0. * Update the target to `x86_64_v3` --- gh/spack.yaml | 10 +++++----- ncdu/spack.yaml | 9 ++++----- openssh/spack.yaml | 9 ++++----- pinentry/spack.yaml | 9 ++++----- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index a2f4985..6fb7e34 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -6,6 +6,7 @@ # This manifest is for installing gh, the GitHub command line interface spack: definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [gh] - _version: [2.49.2] specs: @@ -14,17 +15,16 @@ spack: # Compilers c: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' cxx: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' fortran: require: - - 'gcc@14.1.0' - + - 'gcc@15.1.0' all: prefer: - - 'target=x86_64' + - 'target=x86_64_v3' view: true concretizer: unify: true diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index d40de51..a6433f8 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -15,17 +15,16 @@ spack: # Compilers c: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' cxx: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' fortran: require: - - 'gcc@14.1.0' - + - 'gcc@15.1.0' all: prefer: - - 'target=x86_64' + - 'target=x86_64_v3' view: true concretizer: unify: true diff --git a/openssh/spack.yaml b/openssh/spack.yaml index adfea5b..3e0979e 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -15,17 +15,16 @@ spack: # Compilers c: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' cxx: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' fortran: require: - - 'gcc@14.1.0' - + - 'gcc@15.1.0' all: prefer: - - 'target=x86_64' + - 'target=x86_64_v3' view: true concretizer: unify: true diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index 0f7ebd6..67d1ef5 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -15,17 +15,16 @@ spack: # Compilers c: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' cxx: require: - - 'gcc@14.1.0' + - 'gcc@15.1.0' fortran: require: - - 'gcc@14.1.0' - + - 'gcc@15.1.0' all: prefer: - - 'target=x86_64' + - 'target=x86_64_v3' view: true concretizer: unify: true From d2ed50c187a0db86e2c140b17c29b6267b8b4d85 Mon Sep 17 00:00:00 2001 From: Harshula Jayasuriya Date: Mon, 16 Feb 2026 14:00:36 +1100 Subject: [PATCH 2/2] spack.yaml: add a build revision to the version --- gh/spack.yaml | 4 ++-- ncdu/spack.yaml | 4 ++-- openssh/spack.yaml | 4 ++-- pinentry/spack.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index 6fb7e34..aeb9ead 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -8,7 +8,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [gh] - - _version: [2.49.2] + - _version: [2.49.2-1] specs: - gh@2.49.2 packages: @@ -34,4 +34,4 @@ spack: include: - gh projections: - gh: 'system-tools/{name}/{version}' + gh: 'system-tools/{name}/2.49.2-1' diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index a6433f8..885c6f0 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -8,7 +8,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [ncdu] - - _version: ['1.19'] + - _version: ['1.19-1'] specs: - ncdu@1.19 packages: @@ -34,4 +34,4 @@ spack: include: - ncdu projections: - ncdu: 'system-tools/{name}/{version}' + ncdu: 'system-tools/{name}/1.19-1' diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 3e0979e..ae64bb6 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -8,7 +8,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [openssh] - - _version: [9.9p1] + - _version: [9.9p1-1] specs: - openssh@9.9p1 packages: @@ -34,4 +34,4 @@ spack: include: - openssh projections: - openssh: 'system-tools/{name}/{version}' + openssh: 'system-tools/{name}/9.9p1-1' diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index 67d1ef5..5fdf5df 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -8,7 +8,7 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [pinentry] - - _version: [1.3.0] + - _version: [1.3.0-1] specs: - pinentry@1.3.0 gui=tty packages: @@ -34,4 +34,4 @@ spack: include: - pinentry projections: - pinentry: 'system-tools/{name}/{version}' + pinentry: 'system-tools/{name}/1.3.0-1'