diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-10-25T13·52+0200 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-10-25T13·52+0200 |
| commit | d35debf882a500f67bf8299dac8124c29b2f60f5 (patch) | |
| tree | 9dff9c01605b7e1110fa00157b5e485089d3cc3d | |
| parent | 9081e4aae493a305cdecf3f1faed71d52c6f196d (diff) | |
chore: Bump Nixery version & package set configuration
| -rw-r--r-- | infra/kubernetes/nixery/config.yaml | 2 | ||||
| -rw-r--r-- | infra/kubernetes/primary-cluster.yaml | 1 | ||||
| -rw-r--r-- | third_party/nixery.nix | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/infra/kubernetes/nixery/config.yaml b/infra/kubernetes/nixery/config.yaml index 796e21a727..0775e79b58 100644 --- a/infra/kubernetes/nixery/config.yaml +++ b/infra/kubernetes/nixery/config.yaml @@ -42,6 +42,8 @@ spec: value: 'ssh -F /var/nixery/ssh_config' - name: NIXERY_PKGS_REPO value: {{ .repo }} + - name: NIX_POPULARITY_URL + value: 'https://storage.googleapis.com/nixery-layers/popularity/{{ .popularity }}' volumes: - name: nixery-secrets secret: diff --git a/infra/kubernetes/primary-cluster.yaml b/infra/kubernetes/primary-cluster.yaml index ee57914358..aff6de4b93 100644 --- a/infra/kubernetes/primary-cluster.yaml +++ b/infra/kubernetes/primary-cluster.yaml @@ -25,6 +25,7 @@ include: bucket: tazjins-data account: nixery@tazjins-infrastructure.iam.gserviceaccount.com repo: git@github.com:tazjin/depot.git + popularity: 'popularity-19.09.891.80b42e630b2.json' - name: tazblog - name: https-lb - name: nginx diff --git a/third_party/nixery.nix b/third_party/nixery.nix index 35fe36356f..cb10e0b913 100644 --- a/third_party/nixery.nix +++ b/third_party/nixery.nix @@ -5,8 +5,8 @@ let src = pkgs.fetchFromGitHub { owner = "google"; repo = "nixery"; - rev = "924a4b2d3bf5ed9d7052d7ac09288bb0037daae1"; - sha256 = "1ccq2nk4kbprm48zzpvc132970wvdmvi1iyyrk8kbrf3b92gsm63"; + rev = "4f6ce83f9296545d6c74321b37d18545764c8827"; + sha256 = "19aiak1pss6vwm0fwn02827l5ir78fkqglfbdl2gchsyv3gps8bg"; }; in import src { inherit pkgs; |