From f2404513a04fd4bff4c812d8efabf099c470f4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 12 May 2022 10:53:14 +0200 Subject: [PATCH] style(flake): match new overlay argument convention --- flake.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 240008a..4ea9bed 100644 --- a/flake.nix +++ b/flake.nix @@ -40,27 +40,27 @@ }@inputs: let overlays = { - neovim = self: super: + neovim = final: prev: let buildVimPlugin = name: input: - super.pkgs.vimUtils.buildVimPluginFrom2Nix { + prev.pkgs.vimUtils.buildVimPluginFrom2Nix { pname = name; version = input.rev; versionSuffix = "-git"; src = input; }; in { - vimPlugins = super.vimPlugins // { + vimPlugins = prev.vimPlugins // { nvim-kitty-navigator = buildVimPlugin "nvim-kitty-navigator" nvim-kitty-navigator; }; }; - deconz = self: super: { - deconz = self.qt5.callPackage ./pkgs/deconz { }; + deconz = final: prev: { + deconz = final.qt5.callPackage ./pkgs/deconz { }; }; - glslls = self: super: { + glslls = final: prev: { glsl-language-server = - nixpkgs-glslls.legacyPackages.${self.system}.glsl-language-server; + nixpkgs-glslls.legacyPackages.${final.system}.glsl-language-server; }; }; nixosModules = { @@ -168,7 +168,6 @@ }; }; - # TODO `nix flake check` fails atm which causes this to fail, too checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;