From 6053b7ed651f8be70bd9d936bec433ad7c6ccbad Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sun, 1 Dec 2024 22:18:48 +1100
Subject: [PATCH] Fix lint warnings raised by deadnix (#1540)

---
 flake.nix                | 3 +--
 nix/ihaskell-overlay.nix | 4 ++--
 nix/mkDevShell.nix       | 8 ++++----
 nix/overlay-9.10.nix     | 4 ++--
 nix/overlay-9.6.nix      | 4 ++--
 nix/overlay-9.8.nix      | 4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 706bd779..e8a6b2b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,8 +17,7 @@
 
   outputs = { self, nixpkgs24_05, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
     flake-utils.lib.eachDefaultSystem (system: let
-      baseOverlay = self: super: { inherit nix-filter; };
-      pkgs24_05  = import nixpkgs24_05  { inherit system; overlays = [baseOverlay]; };
+      baseOverlay = _self: _super: { inherit nix-filter; };
       pkgsMaster = import nixpkgsMaster { inherit system; overlays = [baseOverlay]; };
 
       jupyterlab = pkgsMaster.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
diff --git a/nix/ihaskell-overlay.nix b/nix/ihaskell-overlay.nix
index cef66254..aa6c1eac 100644
--- a/nix/ihaskell-overlay.nix
+++ b/nix/ihaskell-overlay.nix
@@ -5,7 +5,7 @@
 , enableHlint
 }:
 
-self: super:
+self: _super:
 
 let
   ihaskell-src = callPackage ./ihaskell-src.nix {};
@@ -32,7 +32,7 @@ in
   in
     if enableHlint
     then baseIhaskell
-    else baseIhaskell.overrideScope (self: super: { hlint = null; });
+    else baseIhaskell.overrideScope (_self: _super: { hlint = null; });
 
   ghc-parser     = self.callCabal2nix "ghc-parser" (builtins.path { path = ../ghc-parser; name = "ghc-parser-src"; }) {};
   ipython-kernel = self.callCabal2nix "ipython-kernel" (builtins.path { path = ../ipython-kernel; name = "ipython-kernel-src"; }) {};
diff --git a/nix/mkDevShell.nix b/nix/mkDevShell.nix
index 07f2d967..09352733 100644
--- a/nix/mkDevShell.nix
+++ b/nix/mkDevShell.nix
@@ -1,14 +1,14 @@
 { pkgs
 
-, hls
-, system
-, version
+# , hls
+# , system
+# , version
 , haskellPackages
 , ihaskellOverlay
 }:
 
 let
-  compilerVersion = builtins.substring 3 100 version;
+  # compilerVersion = builtins.substring 3 100 version;
 
   devIHaskell = haskellPackages.developPackage {
     root =  pkgs.lib.cleanSource ../.;
diff --git a/nix/overlay-9.10.nix b/nix/overlay-9.10.nix
index eb795971..c5bc5c56 100644
--- a/nix/overlay-9.10.nix
+++ b/nix/overlay-9.10.nix
@@ -1,4 +1,4 @@
-sel: sup: {
+_sel: sup: {
   haskell = sup.haskell // {
     packages = sup.haskell.packages // {
       ghc910 = sup.haskell.packages.ghc910.override {
@@ -10,7 +10,7 @@ sel: sup: {
           primitive = sup.haskell.lib.doJailbreak super.primitive;
           call-stack = sup.haskell.lib.dontCheck super.call-stack;
           doctest = sup.haskell.lib.doJailbreak (sup.haskell.lib.dontCheck super.doctest);
-          hashable = sup.haskell.lib.doJailbreak (super.hashable.overrideScope(sel: sup: {
+          hashable = sup.haskell.lib.doJailbreak (super.hashable.overrideScope(_sel: _sup: {
             os-string = null;
           }));
           ChasingBottoms = sup.haskell.lib.doJailbreak super.ChasingBottoms;
diff --git a/nix/overlay-9.6.nix b/nix/overlay-9.6.nix
index 014c0695..c150c7f4 100644
--- a/nix/overlay-9.6.nix
+++ b/nix/overlay-9.6.nix
@@ -1,8 +1,8 @@
-sel: sup: {
+_sel: sup: {
   haskell = sup.haskell // {
     packages = sup.haskell.packages // {
       ghc96 = sup.haskell.packages.ghc96.override {
-        overrides = self: super: {
+        overrides = self: _super: {
 
           plot = self.callHackage "plot" "0.2.3.12" {};
 
diff --git a/nix/overlay-9.8.nix b/nix/overlay-9.8.nix
index a084c265..6764e19b 100644
--- a/nix/overlay-9.8.nix
+++ b/nix/overlay-9.8.nix
@@ -1,9 +1,9 @@
-sel: sup: {
+_sel: sup: {
   haskell = sup.haskell // {
     packages = sup.haskell.packages // {
       ghc98 = sup.haskell.packages.ghc98.override {
         overrides = self: super: {
-          ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: {
+          ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: _super: {
             ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
           });