flake.nix

@@ -28,10 +28,10 @@
       };
 
       overlays = import ./overlays // {
-        pkgs = _final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
+        pkgs = final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
       };
 
-      overlay = _final: _prev: {
+      overlay = final: prev: {
         xeals = nixpkgs.lib.composeExtensions self.overlays.pkgs;
       };
 
@@ -41,7 +41,7 @@
           xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
         in
         lib.filterAttrs
-          (_attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
+          (attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
           xPkgs);
 
       apps = forAllSystems (system:

modules/services/hardware/amdgpu-common.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 

modules/services/hardware/amdgpu-pwm.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 

overlay.nix

@@ -2,7 +2,7 @@
 # case where you don't want to add the whole NUR namespace to your
 # configuration.
 
-_self: super:
+self: super:
 
 let
 

pkgs/applications/audio/mopidy/subidy.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 , python3Packages
 

pkgs/applications/audio/psst/default.nix

@@ -1,7 +1,9 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 , rustPlatform
 
+, cmake
 , pkg-config
 , alsaLib
 , dbus

pkgs/applications/editors/jetbrains/common-plugins.nix

@@ -21,10 +21,9 @@ let
     ];
   };
 
-  generateCommon = lib.makeOverridable (
+  generateCommon = lib.makeOverridable ({
-    { common ? ./manual-common-packages.nix
+    common ? ./manual-common-packages.nix
-    }:
+  }: let
-    let
 
     imported = import common {
       inherit (self) callPackage;
@@ -36,10 +35,7 @@ let
 
     jetbrainsPlugins = super // overrides;
 
-    in
+  in jetbrainsPlugins // { inherit commonBuild; });
-    jetbrainsPlugins // { inherit commonBuild; }
-  );
 
-in
+in generateCommon { }
-generateCommon { }
 

pkgs/applications/editors/jetbrains/idea-plugins.nix

@@ -9,10 +9,9 @@ let
     jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
   };
 
-  generateIdea = lib.makeOverridable (
+  generateIdea = lib.makeOverridable ({
-    { idea ? ./manual-idea-packages.nix
+    idea ? ./manual-idea-packages.nix
-    }:
+  }: let
-    let
 
     imported = import idea {
       inherit (self) callPackage;
@@ -24,10 +23,7 @@ let
 
     ideaPlugins = super // overrides;
 
-    in
+  in ideaPlugins // { inherit ideaBuild; });
-    ideaPlugins // { inherit ideaBuild; }
-  );
 
-in
+in generateIdea { }
-generateIdea { }
 

pkgs/applications/networking/protonmail-bridge/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 , buildGoModule
 

pkgs/applications/window-managers/cardboard/default.nix

@@ -1,12 +1,16 @@
 { stdenv
 , lib
 , fetchFromGitLab
+, fetchzip
+
 , cereal
 , cmake
+, git
 , libGL
 , libX11
 , libinput
 , libxkbcommon
+, mesa
 , meson
 , ninja
 , pixman

pkgs/development/go-modules/qt/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 , buildGoModule
 , makeWrapper
@@ -63,6 +64,5 @@ buildGoModule rec {
     homepage = "https://github.com/therecipe/qt";
     description = "Qt bindings for Go";
     license = licenses.lgpl3;
-    broken = true;
   };
 }

pkgs/development/libraries/libhl/default.nix

@@ -2,6 +2,7 @@
 , lib
 , fetchFromGitHub
 
+, coreutils
 , autoreconfHook
 }:
 

pkgs/development/python-modules/py-sonic/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 }:

pkgs/tools/misc/amdgpu-fan/default.nix

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 
 , python3Packages

pkgs/tools/misc/samrewritten/default.nix

@@ -1,6 +1,8 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, makeWrapper
+
 , curl
 , gnumake
 , gnutls

pkgs/tools/misc/spotify-ripper/default.nix

@@ -1,22 +1,16 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 
 , python3Packages
 , lame
 
-, aacSupport ? false
+, aacSupport ? false, faac
-, faac
+, alacSupport ? false, libav
-, alacSupport ? false
+, flacSupport ? false, flac
-, libav
+, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder
-, flacSupport ? false
+, oggSupport ? false, vorbisTools
-, flac
+, opusSupport ? false, opusTools
-, m4aSupport ? false
-, mp4Support ? false
-, fdk-aac-encoder
-, oggSupport ? false
-, vorbisTools
-, opusSupport ? false
-, opusTools
 }:
 
 assert aacSupport               -> faac.meta.available;

pkgs/tools/misc/ytarchive/default.nix

@@ -3,8 +3,7 @@
 , fetchFromGitHub
 
 , python3
-, ffmpeg
+, ffmpeg }:
-}:
 
 stdenv.mkDerivation rec {
   pname = "ytarchive";

pkgs/top-level/all-packages.nix

@@ -42,7 +42,7 @@ rec {
 
   pam_gnupg = pkgs.callPackage ../os-specific/linux/pam_gnupg { };
 
-  picom-animations = pkgs.picom.overrideAttrs (_oldAttrs: {
+  picom-animations = pkgs.picom.overrideAttrs (oldAttrs: {
     pname = "picom-animations";
     src = pkgs.fetchFromGitHub {
       owner = "jonaburg";

pkgs/top-level/jetbrains-plugins.nix

@@ -20,9 +20,8 @@ let
     inherit lib;
   };
 
-in
+in lib.makeScope newScope (self: lib.makeOverridable ({
-lib.makeScope newScope (self: lib.makeOverridable
+  jetbrainsPlugins ? mkJetbrainsPlugins self
-  ({ jetbrainsPlugins ? mkJetbrainsPlugins self
   , ideaPlugins ? mkIdeaPlugins self
 }: ({ }
   // jetbrainsPlugins // { inherit jetbrainsPlugins; }
@@ -31,5 +30,4 @@ lib.makeScope newScope (self: lib.makeOverridable
     inherit variant;
     jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
   })
-  )
+) { })
-  { })