From bff66d05b9eb38ebdc42a5bc70ddfa32ef535c8c Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Fri, 30 Jun 2023 11:13:15 +0100 Subject: [PATCH] Make version passing work. --- flake.nix | 3 ++- hosts/common/global/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 495b1e0..b397143 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,10 @@ outputs = { self, nixpkgs, deploy-rs, ... }@inputs: let + inherit (self); mkNixos = modules: nixpkgs.lib.nixosSystem { inherit modules; - specialArgs = { inherit inputs; }; + specialArgs = { inherit inputs self; }; }; in { nixosConfigurations = { diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 95367de..cece19e 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -1,3 +1,4 @@ +{ pkgs, self, ... }: { imports = [ ./boot.nix @@ -12,7 +13,7 @@ system.copySystemConfiguration = false; # not supported with flakes # Let 'nixos-version --json' know about the Git revision of the flake - system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + system.configurationRevision = pkgs.lib.mkIf (self ? rev) self.rev; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions