From bde9bc1c1dc21ed565d6728e93e1ff0fc8131794 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 22 Aug 2023 11:48:55 +0300 Subject: [PATCH] fix(ops/nixery): switch nixery.dev to stable nixpkgs channel The current unstable has a bunch of breakage which people have been reporting, lets move the public instance to the stable channel until that is sorted out. Example breakage: https://github.com/tazjin/nixery/issues/159 Change-Id: Id5eb11ebd235928b85c01c178c32da3badea517f Reviewed-on: https://cl.tvl.fyi/c/depot/+/9126 Autosubmit: tazjin Reviewed-by: flokli Tested-by: BuildkiteCI --- ops/modules/nixery.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ops/modules/nixery.nix b/ops/modules/nixery.nix index 4122f9ebb..29da46cc1 100644 --- a/ops/modules/nixery.nix +++ b/ops/modules/nixery.nix @@ -5,7 +5,8 @@ let cfg = config.services.depot.nixery; description = "Nixery - container images on-demand"; - storagePath = "/var/lib/nixery/${pkgs.nixpkgsCommits.unstable}"; + nixpkgsSrc = depot.third_party.sources.nixpkgs-stable; + storagePath = "/var/lib/nixery/${nixpkgsSrc.rev}"; in { options.services.depot.nixery = { @@ -33,7 +34,7 @@ in environment = { PORT = toString cfg.port; - NIXERY_PKGS_PATH = pkgs.path; + NIXERY_PKGS_PATH = nixpkgsSrc.outPath; NIXERY_STORAGE_BACKEND = "filesystem"; NIX_TIMEOUT = "60"; # seconds STORAGE_PATH = storagePath;