From a868088cc95f44426d481b1e2518b3173b998fc2 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 14:48:36 +0000
Subject: [PATCH] treewide: rename unused overlay arguments

Now that `nix flake check` doesn't complain about it anymore, try to be
consistent about using that feature.
---
 flake/overlays.nix            | 4 ++--
 lib/default.nix               | 2 +-
 templates/c++-cmake/flake.nix | 2 +-
 templates/c++-meson/flake.nix | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake/overlays.nix b/flake/overlays.nix
index 1a5e8ba..0c47989 100644
--- a/flake/overlays.nix
+++ b/flake/overlays.nix
@@ -4,10 +4,10 @@ let
 
   additional-overlays = {
     # Expose my expanded library
-    lib = final: prev: { inherit (self) lib; };
+    lib = _final: _prev: { inherit (self) lib; };
 
     # Expose my custom packages
-    pkgs = final: prev: {
+    pkgs = _final: prev: {
       ambroisie = prev.recurseIntoAttrs (import "${self}/pkgs" { pkgs = prev; });
     };
   };
diff --git a/lib/default.nix b/lib/default.nix
index 8358d58..894e351 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -15,4 +15,4 @@ let
     mapModules ./. (file: import file { inherit self lib pkgs inputs; })
   );
 in
-mylib.extend (self: super: foldr (a: b: a // b) { } (attrValues super))
+mylib.extend (_self: super: foldr (a: b: a // b) { } (attrValues super))
diff --git a/templates/c++-cmake/flake.nix b/templates/c++-cmake/flake.nix
index c7e2794..cb468e7 100644
--- a/templates/c++-cmake/flake.nix
+++ b/templates/c++-cmake/flake.nix
@@ -31,7 +31,7 @@
   outputs = { self, futils, nixpkgs, pre-commit-hooks }:
     {
       overlays = {
-        default = final: prev: {
+        default = final: _prev: {
           project = with final; stdenv.mkDerivation {
             pname = "project";
             version = "0.0.0";
diff --git a/templates/c++-meson/flake.nix b/templates/c++-meson/flake.nix
index d62eda2..9cfed0d 100644
--- a/templates/c++-meson/flake.nix
+++ b/templates/c++-meson/flake.nix
@@ -31,7 +31,7 @@
   outputs = { self, futils, nixpkgs, pre-commit-hooks }:
     {
       overlays = {
-        default = final: prev: {
+        default = final: _prev: {
           project = with final; stdenv.mkDerivation {
             pname = "project";
             version = "0.0.0";