From 0119f28afca3ca2e6aa20432d5f9e9b3d4b8c4e3 Mon Sep 17 00:00:00 2001 From: Ning Shang Date: Wed, 12 Jul 2023 21:49:36 -0700 Subject: [PATCH] Upgrade nixpkgs to 23.05 for r10e builds (#21) The associated golang compiler version is go1.20.4. --- pkg/r10e-docker/files/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/r10e-docker/files/Dockerfile b/pkg/r10e-docker/files/Dockerfile index d62334a..3c17c9c 100644 --- a/pkg/r10e-docker/files/Dockerfile +++ b/pkg/r10e-docker/files/Dockerfile @@ -6,8 +6,8 @@ FROM nixos/nix:2.9.0@sha256:13b257cd42db29dc851f9818ea1bc2f9c7128c51fdf000971fa6 ######################################################### ENV PROJECT_NAME={{.ProjectName}} WORKDIR "/build/${PROJECT_NAME}" -# nixpkgs 22.11. This version has go 1.19.3 -ENV NIXPKGS_COMMIT_SHA="4d2b37a84fad1091b9de401eb450aae66f1a741e" +# nixpkgs 23.05. This version has go 1.20.4 +ENV NIXPKGS_COMMIT_SHA="4ecab3273592f27479a583fb6d975d4aba3486fe" # Apple M1 workaround COPY r10e-docker/nix.conf "/build/${PROJECT_NAME}/nix.conf" @@ -32,7 +32,7 @@ COPY . "/build/${PROJECT_NAME}" RUN cd "/build/${PROJECT_NAME}" && \ {{range $index, $x := .Artifacts}}mkdir -p /archive/$(dirname {{$x.Destination}}) && \ {{end}}{{range $index, $x := .ExternalData}}mkdir -p /archive/$(dirname {{$x.Destination}}) && \ - {{end}}nix-shell -p go_1_19 gnumake \ + {{end}}nix-shell -p go_1_20 gnumake \ --run "go version && \ {{.BuildCmd}}" && \ sha256sum {{range $index, $x := .Artifacts}}/build/${PROJECT_NAME}/{{$x.Source}} {{end}} && \