From a83dcb3ed5cb5b621dc60d4783b6a363f502a31a Mon Sep 17 00:00:00 2001 From: xeals Date: Wed, 26 Oct 2022 10:51:44 +1100 Subject: [PATCH] all: apply deadnix --- flake.nix | 6 +++--- modules/services/hardware/amdgpu-common.nix | 2 +- modules/services/hardware/amdgpu-pwm.nix | 2 +- overlay.nix | 2 +- pkgs/applications/audio/mopidy/subidy.nix | 3 +-- pkgs/applications/audio/psst/default.nix | 4 +--- pkgs/applications/networking/protonmail-bridge/default.nix | 3 +-- pkgs/applications/window-managers/cardboard/default.nix | 4 ---- pkgs/development/go-modules/qt/default.nix | 3 +-- pkgs/development/libraries/libhl/default.nix | 1 - pkgs/development/python-modules/py-sonic/default.nix | 3 +-- pkgs/tools/misc/amdgpu-fan/default.nix | 3 +-- pkgs/tools/misc/samrewritten/default.nix | 2 -- pkgs/tools/misc/spotify-ripper/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 2 +- 15 files changed, 14 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index b3c31dc..6943640 100644 --- a/flake.nix +++ b/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: diff --git a/modules/services/hardware/amdgpu-common.nix b/modules/services/hardware/amdgpu-common.nix index ca4639d..65b0db1 100644 --- a/modules/services/hardware/amdgpu-common.nix +++ b/modules/services/hardware/amdgpu-common.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/modules/services/hardware/amdgpu-pwm.nix b/modules/services/hardware/amdgpu-pwm.nix index 5849f5b..1ae03cc 100644 --- a/modules/services/hardware/amdgpu-pwm.nix +++ b/modules/services/hardware/amdgpu-pwm.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/overlay.nix b/overlay.nix index c3aab71..73282cf 100644 --- a/overlay.nix +++ b/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 diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix index 855f90c..ad545dd 100644 --- a/pkgs/applications/audio/mopidy/subidy.nix +++ b/pkgs/applications/audio/mopidy/subidy.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index ee8576c..98da75d 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -1,9 +1,7 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , rustPlatform -, cmake , pkg-config , alsaLib , dbus diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 9bbd9cc..89b5f5f 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , buildGoModule diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix index 38e49a4..fadd97c 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/applications/window-managers/cardboard/default.nix @@ -1,16 +1,12 @@ { stdenv , lib , fetchFromGitLab -, fetchzip - , cereal , cmake -, git , libGL , libX11 , libinput , libxkbcommon -, mesa , meson , ninja , pixman diff --git a/pkgs/development/go-modules/qt/default.nix b/pkgs/development/go-modules/qt/default.nix index b8bd9c9..d8984e2 100644 --- a/pkgs/development/go-modules/qt/default.nix +++ b/pkgs/development/go-modules/qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , buildGoModule , makeWrapper diff --git a/pkgs/development/libraries/libhl/default.nix b/pkgs/development/libraries/libhl/default.nix index b82f341..d59480d 100644 --- a/pkgs/development/libraries/libhl/default.nix +++ b/pkgs/development/libraries/libhl/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub -, coreutils , autoreconfHook }: diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index eca2936..037c436 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi }: diff --git a/pkgs/tools/misc/amdgpu-fan/default.nix b/pkgs/tools/misc/amdgpu-fan/default.nix index 2a5f9f1..f8eac9f 100644 --- a/pkgs/tools/misc/amdgpu-fan/default.nix +++ b/pkgs/tools/misc/amdgpu-fan/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages diff --git a/pkgs/tools/misc/samrewritten/default.nix b/pkgs/tools/misc/samrewritten/default.nix index ef45e80..8c3b910 100644 --- a/pkgs/tools/misc/samrewritten/default.nix +++ b/pkgs/tools/misc/samrewritten/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, makeWrapper - , curl , gnumake , gnutls diff --git a/pkgs/tools/misc/spotify-ripper/default.nix b/pkgs/tools/misc/spotify-ripper/default.nix index c13bf3c..d0c61f8 100644 --- a/pkgs/tools/misc/spotify-ripper/default.nix +++ b/pkgs/tools/misc/spotify-ripper/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83b2fb4..f54f596 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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";