From 74430a81ff583040ae94cff21eacec1e4b32b074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 23 Jul 2020 17:36:45 +0200 Subject: [PATCH] flake.nix: use lib.extend This preserves the nixosSystem function if another flake uses lib.extend itself. --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index e37621c6fc1..0f0164de9c1 100644 --- a/flake.nix +++ b/flake.nix @@ -18,17 +18,17 @@ in { - lib = lib // { + lib = lib.extend (final: prev: { nixosSystem = { modules, ... } @ args: import ./nixos/lib/eval-config.nix (args // { modules = modules ++ [ { system.nixos.versionSuffix = - ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; - system.nixos.revision = lib.mkIf (self ? rev) self.rev; + ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; + system.nixos.revision = final.mkIf (self ? rev) self.rev; } ]; }); - }; + }); checks.x86_64-linux.tarball = jobs.tarball;