From d35debf882a500f67bf8299dac8124c29b2f60f5 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 25 Oct 2019 15:52:23 +0200
Subject: chore: Bump Nixery version & package set configuration

---
 infra/kubernetes/nixery/config.yaml   | 2 ++
 infra/kubernetes/primary-cluster.yaml | 1 +
 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 796e21a7273c..0775e79b5843 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 ee5791435851..aff6de4b9323 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 35fe36356f5a..cb10e0b913b1 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;
-- 
cgit 1.4.1