From 97a2d97047633769f2d7ebe3b0055c027113e512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Feb 2023 01:27:35 +0100 Subject: [PATCH] Pin NIX_PATH, nixpkgs flake --- config/default.nix | 8 +++++++- flake.lock | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/default.nix b/config/default.nix index 11311286..ee0431b6 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, zentralwerk, ... }: +{ config, inputs, lib, pkgs, zentralwerk, ... }: # this file contains default configuration that may be turned on depending on other config settings. # options should go to modules. @@ -71,6 +71,12 @@ options = "--delete-older-than 21d"; randomizedDelaySec = "6h"; }; + nixPath = [ + "nixpkgs=${builtins.unsafeDiscardStringContext inputs.nixos}" + "nixos=${builtins.unsafeDiscardStringContext inputs.nixos}" + "nixos-config=/you/shall/deploy/from/the/flake" + ]; + registry.nixpkgs.flake = inputs.nixos; settings = { builders-use-substitutes = true; # TODO: move connect-timeout = 20; diff --git a/flake.lock b/flake.lock index 3883d01f..0f257db6 100644 --- a/flake.lock +++ b/flake.lock @@ -356,11 +356,11 @@ }, "nixos": { "locked": { - "lastModified": 1675111798, - "narHash": "sha256-di8ZRfbUT+DGBaIXJHSpyjQRkR0DAe/C79c3WvaLrt4=", + "lastModified": 1675200355, + "narHash": "sha256-TJWs5sOwfqK+9Yq15RBIeozVMRnqYSqCRBhfnn+w30M=", "owner": "SuperSandro2000", "repo": "nixpkgs", - "rev": "3dd783a9a59d3da0d55b7b96e515e58891a3ad95", + "rev": "09e91f75f780359921c20c3cee408123db79fb97", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1675199377, - "narHash": "sha256-Bk59zSy/lH0Gtp5vErhnktWVWGx9UVRINem2ephxMFE=", + "lastModified": 1675210774, + "narHash": "sha256-qhrDfDV/D0VsOHGskqOAhUxCTwPFIPgWIG/ASGLZMws=", "owner": "SuperSandro2000", "repo": "nixos-modules", - "rev": "e59b245ffa3d0578561a081c1cdad34f2cd67cd1", + "rev": "f0501fae1643407e2344a952055c61831c204030", "type": "github" }, "original": {