Skip to content

Commit

Permalink
Upgrade nixpkgs to 23.05 for r10e builds (#21)
Browse files Browse the repository at this point in the history
The associated golang compiler version is go1.20.4.
  • Loading branch information
syncom authored Jul 13, 2023
1 parent a7808a8 commit 0119f28
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/r10e-docker/files/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}} && \
Expand Down

0 comments on commit 0119f28

Please sign in to comment.