Skip to content
Snippets Groups Projects
Commit fd959e85 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

that didn't work; try a newer image

parent 1fc4c0e4
No related branches found
No related tags found
1 merge request!277Refactor the Nix packaging for reduced duplication and to provide a more useful shell environment
...@@ -148,7 +148,11 @@ jobs: ...@@ -148,7 +148,11 @@ jobs:
# one day someone pushed a bad revision to it and our CI broke. So now # one day someone pushed a bad revision to it and our CI broke. So now
# we just pin some recent version. Who would have thought a floating # we just pin some recent version. Who would have thought a floating
# dependency would cause build instability? # dependency would cause build instability?
- image: "nixos/nix:2.5.1" #
# This pre-release image in particular fixes a problem in the 2.5.1
# image where no CA certificates are available.
# https://github.com/NixOS/nix/issues/5797
- image: "nixos/nix:2.6.0pre20211228_f7d22f4-"
# Tahoe-LAFS requires more memory than we get from the default resource # Tahoe-LAFS requires more memory than we get from the default resource
# class and sometimes we have to build it. # class and sometimes we have to build it.
...@@ -167,18 +171,6 @@ jobs: ...@@ -167,18 +171,6 @@ jobs:
NIXPKGS: "https://github.com/NixOS/nixpkgs/archive/28abc4e43a24d28729509e2d83f5c4f3b3418189.tar.gz" NIXPKGS: "https://github.com/NixOS/nixpkgs/archive/28abc4e43a24d28729509e2d83f5c4f3b3418189.tar.gz"
steps: steps:
- run:
# Work around a bug in the 2.5.1 Docker image that prevents it from
# having any CA certificates to use to validate any certificates it
# encounters (and thus makes it incapable of talking to our binary
# caches).
#
# The work-around is from a comment on the issue
# https://github.com/NixOS/nix/issues/5797
name: "Fix CA Certificates"
command: |
ln -s $NIX_SSL_CERT_FILE /etc/ssl/certs/
- run: - run:
name: "Set up Cachix" name: "Set up Cachix"
command: | command: |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment