From eab90cce8f17a392da257ae150185acd34da32ba Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 12:12:32 -0400 Subject: [PATCH] pkgs/tools/package-management: remove dead code --- pkgs/tools/package-management/appimagekit/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 2 +- pkgs/tools/package-management/fusesoc/default.nix | 1 - pkgs/tools/package-management/home-manager/default.nix | 4 ++-- pkgs/tools/package-management/nix/default.nix | 4 ++-- pkgs/tools/package-management/pdm/default.nix | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 3fa9528add1..d11cd161275 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -17,7 +17,7 @@ let }; # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { + appimagekit_squashfuse = squashfuse.overrideAttrs rec { pname = "squashfuse"; version = "unstable-2016-10-09"; @@ -61,7 +61,7 @@ let cp -v ./.libs/*.a $out/lib cp -v ./*.h $out/include ''; - }); + }; in stdenv.mkDerivation rec { pname = "appimagekit"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index dedb57960b3..27f055c089c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }: stdenv.mkDerivation rec { pname = "disnix"; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/tools/package-management/fusesoc/default.nix index 92a8dc1807b..99926fd5c04 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/tools/package-management/fusesoc/default.nix @@ -4,7 +4,6 @@ , verilog , verilator , gnumake -, gcc , edalize , fastjsonschema , pyparsing diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 89a626fef67..c65b244cb96 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -14,7 +14,7 @@ , unstableGitUpdater }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "home-manager"; version = "2023-05-30"; @@ -89,4 +89,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; }; -}) +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5b2fa002913..263e4a130ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -76,10 +76,10 @@ let aws-sdk-cpp-nix = (aws-sdk-cpp.override { apis = [ "s3" "transfer" ]; customMemoryManagement = false; - }).overrideAttrs (args: { + }).overrideAttrs { # only a stripped down version is build which takes a lot less resources to build requiredSystemFeatures = [ ]; - }); + }; common = args: diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 7b689480c2a..43e1dd87134 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -7,7 +7,7 @@ let # 3. Ansible being unable to upgrade to a later version of resolvelib # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { - resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { + resolvelib = super.resolvelib.overridePythonAttrs rec { version = "1.0.1"; src = fetchFromGitHub { owner = "sarugaku"; @@ -15,7 +15,7 @@ let rev = "/refs/tags/${version}"; hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; - }); + }; }; self = python; };