diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/tools/X11/sunpaper/default.nix index 9f760bb4a93f..116b0225ab0f 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/tools/X11/sunpaper/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , sunwait , wallutils -, rPackages }: stdenvNoCC.mkDerivation rec { @@ -27,7 +26,7 @@ stdenvNoCC.mkDerivation rec { --replace "sunwait" "${sunwait}/bin/sunwait" \ --replace "setwallpaper" "${wallutils}/bin/setwallpaper" \ --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" - ''; + ''; installPhase = '' mkdir -p "$out/bin" "$out/share/sunpaper/images" diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e4c904fffbc6..3a108d7c8ed0 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, enableShared ? !(stdenv.hostPlatform.isStatic) +, enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests , nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = let - inherit (stdenv.hostPlatform.extensions) sharedLibrary; soVersion = "3"; in diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 16fe6c579c0a..8b341298f311 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages +{ lib, fetchFromGitHub, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { + camlpdf = ocamlPackages.camlpdf.overrideAttrs { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }); + }; otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/tools/typesetting/tex/mftrace/default.nix index 9f061630e224..4b8a0350c8b1 100644 --- a/pkgs/tools/typesetting/tex/mftrace/default.nix +++ b/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , autoreconfHook -, buildEnv , python3 , fontforge , potrace diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix index fe08d6823396..4fd32aadf8ce 100644 --- a/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix +++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "pgf-umlcd"; version = "unstable-2020-05-28"; @@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -}) +} diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index e03deea51fc2..9b2a9a7be031 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -10,12 +10,10 @@ , makeWrapper , mplayer , mpv -, ncurses , procps , scdoc , stdenv , streamlink -, sudo , vlc }: diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index f9828abe629c..696b0b822e51 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -18,7 +18,7 @@ let cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + pyyaml = super.pyyaml.overridePythonAttrs rec { version = "5.4.1"; checkPhase = '' runHook preCheck @@ -30,7 +30,7 @@ let inherit version; hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; }; - }); + }; }; }; in diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544aea2..c980a45bbef2 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index f531b5ca84ac..f34a56f5d143 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper +{ buildGoModule, fetchFromGitHub, lib, coreutils, makeWrapper , google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps }: diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/tools/virtualization/google-guest-configs/default.nix index dd3c01c6229a..73dd3c93d255 100644 --- a/pkgs/tools/virtualization/google-guest-configs/default.nix +++ b/pkgs/tools/virtualization/google-guest-configs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll +{ stdenv, lib, fetchFromGitHub, makeWrapper , ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 68ca58fb64ff..84e6a865dcd6 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -1,6 +1,5 @@ -{ stdenv -, lib -, bashInteractive +{ lib +, stdenv , curl , fetchFromGitHub , json_c diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index bbd80391c7ae..5f501647783e 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} -, requireFile, autoPatchelfHook, makeWrapper, unzip +, autoPatchelfHook, makeWrapper, unzip , glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib }: diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 8a57fd581037..3d74344a4e76 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkgs , pam , scdoc , gtk3 diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index 3f98e8ef8c21..51edcc0ea3a2 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , meson -, cmake , ninja , wlroots , wayland diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 2bd2dbcf7e38..3555af7c0424 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; version = "0.8.1"; diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index dd2e6502bc8c..646ed3698504 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -10,7 +10,6 @@ , wayland-protocols , wl-clipboard , libxkbcommon -, cmake , libressl }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix index 041c3dfe8cce..ca3a3f419116 100644 --- a/pkgs/tools/wayland/wayout/default.nix +++ b/pkgs/tools/wayland/wayout/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromSourcehut , rustPlatform +, fetchFromSourcehut }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/wayland/wlay/default.nix b/pkgs/tools/wayland/wlay/default.nix index a766a49d25d9..3a80e0627e37 100644 --- a/pkgs/tools/wayland/wlay/default.nix +++ b/pkgs/tools/wayland/wlay/default.nix @@ -15,7 +15,7 @@ , wayland-scanner }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "wlay"; version = "unstable-2022-01-26"; @@ -54,4 +54,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -}) +}