about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-08-22T08·48+0300
committertazjin <tazjin@tvl.su>2023-08-22T15·01+0000
commitbde9bc1c1dc21ed565d6728e93e1ff0fc8131794 (patch)
tree588b4a9404589ea1a89d854273c333fb840b7f6a
parent7d69e82be3fc22f42c83d997b3141ca0d798c0dc (diff)
fix(ops/nixery): switch nixery.dev to stable nixpkgs channel r/6517
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 <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
-rw-r--r--ops/modules/nixery.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/ops/modules/nixery.nix b/ops/modules/nixery.nix
index 4122f9ebbf3b..29da46cc1de5 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;