diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 5710d80c2cc..fd1166e1a30 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -75,8 +75,8 @@ in substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'').overrideAttrs (old: { +'').overrideAttrs { passthru.tests = { smoke-test = nixosTests.bees; }; -}) +} diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 2437fd358a7..1b0c9c98633 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -107,7 +107,7 @@ let optZfs = shouldUsePkg zfs; # Downgrade rocksdb, 7.10 breaks ceph - rocksdb' = rocksdb.overrideAttrs (oldAttrs: { + rocksdb' = rocksdb.overrideAttrs { version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; @@ -115,7 +115,7 @@ let rev = "refs/tags/v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; - }); + }; hasRadosgw = optExpat != null && optCurl != null && optLibedit != null; @@ -165,7 +165,7 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.46"; src = fetchPypi { pname = "SQLAlchemy"; @@ -176,7 +176,7 @@ let "test/aaa_profiling" "test/ext/mypy" ]; - }); + }; }; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 1efef2d9b53..3d3c1b54db8 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , neon , procps diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index 9c38852e4e9..efdb9f3dc1d 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: let - btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; @@ -9,7 +9,7 @@ let sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; - }); + }; py3 = python3.withPackages (ps: with ps; [ prettytable numpy diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix index b28aaadca90..d825c1b0fb0 100644 --- a/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/pkgs/tools/filesystems/dupe-krill/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "dupe-krill"; diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 1ffe03601df..cd774395c2c 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -9,7 +9,6 @@ , double-conversion , fmt_8 , fuse3 -, gflags , glog , gtest , jemalloc diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 4eb488b2d02..ef4a46868ca 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, testers, Security, garage, nixosTests }: +, cacert, Security, garage, nixosTests }: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 23446ce998d..a1f424915f3 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , fuse diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index aa2260cb374..7f7a9f54fd8 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , python3 diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix index c0b74d9cf1b..d4008b2fa3c 100644 --- a/pkgs/tools/filesystems/mkspiffs/presets.nix +++ b/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -4,10 +4,10 @@ lib.mapAttrs ( name: { CPPFLAGS }: - mkspiffs.overrideAttrs (drv: { + mkspiffs.overrideAttrs { inherit CPPFLAGS; BUILD_CONFIG_NAME = "-${name}"; - }) + } ) { arduino-esp8266.CPPFLAGS = [ "-DSPIFFS_USE_MAGIC_LENGTH=0" diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index a4e1b6d62c4..d4ef2154d81 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,16 +1,13 @@ { lib , stdenv , fetchurl -, fetchpatch , acl , autoreconfHook , avahi , db -, ed , libevent , libgcrypt , libiconv -, libtirpc , openssl , pam , perl diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index fbb1532f3e6..5f3b5e534ca 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libuuid, libselinux , e2fsprogs }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/tools/filesystems/sdat2img/default.nix index 44e884201d4..4176eabad40 100644 --- a/pkgs/tools/filesystems/sdat2img/default.nix +++ b/pkgs/tools/filesystems/sdat2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "sdat2img"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index c52b83ceb1a..ae658330b28 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , help2man , lz4 , lzo diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 5e325591e6e..623cef88447 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix index 885d64f7c41..03adc070c0e 100644 --- a/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -1,5 +1,4 @@ { stdenv -, pkgs , lib , fetchurl , e2fsprogs diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index afafbca58ba..601baabd87e 100644 --- a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -1,8 +1,7 @@ -{ rustPlatform +{ lib +, rustPlatform , cloud-utils , fetchFromGitHub -, lib -, llvmPackages , pkg-config , util-linux , zfs