treewide: fix lints
Arg to lib.optional is a list build time tool in buildInputs *Flags not a list https://github.com/nix-community/nixpkgs-lint
This commit is contained in:
parent
9984ca0504
commit
eac28f38d6
|
@ -294,7 +294,7 @@ let
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
SupplementaryGroups = optional (serverCfg.useACMEHost != null) certConfig.group;
|
SupplementaryGroups = optional (serverCfg.useACMEHost != null) certConfig.group;
|
||||||
PrivateTmp = true;
|
PrivateTmp = true;
|
||||||
AmbientCapabilities = optional (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
|
AmbientCapabilities = optionals (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
|
||||||
NoNewPrivileges = true;
|
NoNewPrivileges = true;
|
||||||
RestrictNamespaces = "uts ipc pid user cgroup";
|
RestrictNamespaces = "uts ipc pid user cgroup";
|
||||||
ProtectSystem = "strict";
|
ProtectSystem = "strict";
|
||||||
|
@ -340,7 +340,7 @@ let
|
||||||
EnvironmentFile = optional (clientCfg.environmentFile != null) clientCfg.environmentFile;
|
EnvironmentFile = optional (clientCfg.environmentFile != null) clientCfg.environmentFile;
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
PrivateTmp = true;
|
PrivateTmp = true;
|
||||||
AmbientCapabilities = (optional (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optional ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);
|
AmbientCapabilities = (optionals (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optionals ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);
|
||||||
NoNewPrivileges = true;
|
NoNewPrivileges = true;
|
||||||
RestrictNamespaces = "uts ipc pid user cgroup";
|
RestrictNamespaces = "uts ipc pid user cgroup";
|
||||||
ProtectSystem = "strict";
|
ProtectSystem = "strict";
|
||||||
|
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||||
libharu
|
libharu
|
||||||
libepoxy
|
libepoxy
|
||||||
]
|
]
|
||||||
++ lib.optional (!stdenv.isAarch64) [
|
++ lib.optionals (!stdenv.isAarch64) [
|
||||||
openimagedenoise
|
openimagedenoise
|
||||||
embree
|
embree
|
||||||
]
|
]
|
||||||
|
|
|
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ openssl ]
|
[ openssl ]
|
||||||
++ lib.optional stdenv.isDarwin [ libgit2 Security ];
|
++ lib.optionals stdenv.isDarwin [ libgit2 Security ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
@ -36,4 +36,3 @@ rustPlatform.buildRustPackage rec {
|
||||||
maintainers = with maintainers; [ tmarkus ];
|
maintainers = with maintainers; [ tmarkus ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ buildGo120Package rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkFlags = "-skip TestSetSessionHandlers";
|
checkFlags = [ "-skip=TestSetSessionHandlers" ];
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then
|
if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then
|
||||||
|
|
|
@ -35,7 +35,7 @@ in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
nativeBuildInputs = lib.optional stdenv.isLinux [ autoPatchelfHook ];
|
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||||
|
|
||||||
buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ];
|
buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ];
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||||
itstool
|
itstool
|
||||||
vala
|
vala
|
||||||
gperf
|
gperf
|
||||||
] ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||||
mesonEmulatorHook
|
mesonEmulatorHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
rdma-core
|
rdma-core
|
||||||
zlib
|
zlib
|
||||||
] ++ lib.optional enableCuda cudatoolkit
|
] ++ lib.optional enableCuda cudatoolkit
|
||||||
++ lib.optional enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];
|
++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-rdmacm=${rdma-core}"
|
"--with-rdmacm=${rdma-core}"
|
||||||
|
|
|
@ -274,9 +274,9 @@ let
|
||||||
sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
|
sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
pkgs.makeWrapper
|
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
# needed for GSETTINGS_SCHEMAS_PATH
|
# needed for GSETTINGS_SCHEMAS_PATH
|
||||||
pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3
|
pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||||
"test_snitun_single_runner_throttling"
|
"test_snitun_single_runner_throttling"
|
||||||
# ConnectionResetError: [Errno 54] Connection reset by peer
|
# ConnectionResetError: [Errno 54] Connection reset by peer
|
||||||
"test_peer_listener_timeout"
|
"test_peer_listener_timeout"
|
||||||
] ++ lib.optional (pythonAtLeast "3.11") [
|
] ++ lib.optionals (pythonAtLeast "3.11") [
|
||||||
# TypeError: Passing coroutines is forbidden, use tasks explicitly.
|
# TypeError: Passing coroutines is forbidden, use tasks explicitly.
|
||||||
"test_snitun_runner_updown"
|
"test_snitun_runner_updown"
|
||||||
];
|
];
|
||||||
|
|
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ];
|
nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ];
|
||||||
|
|
||||||
disabledTestPaths = lib.optional (lib.versionAtLeast numpy.version "1.17") [
|
disabledTestPaths = lib.optionals (lib.versionAtLeast numpy.version "1.17") [
|
||||||
# https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87
|
# https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87
|
||||||
"traittypes/tests/test_traittypes.py"
|
"traittypes/tests/test_traittypes.py"
|
||||||
];
|
];
|
||||||
|
|
|
@ -18,7 +18,7 @@ buildDotnetModule rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
projectFile = "Marksman/Marksman.fsproj";
|
projectFile = "Marksman/Marksman.fsproj";
|
||||||
dotnetBuildFlags = "-p:VersionString=${version}";
|
dotnetBuildFlags = [ "-p:VersionString=${version}" ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
testProjectFile = "Tests/Tests.fsproj";
|
testProjectFile = "Tests/Tests.fsproj";
|
||||||
|
|
|
@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
|
||||||
automake
|
automake
|
||||||
autoconf
|
autoconf
|
||||||
gettext
|
gettext
|
||||||
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -88,7 +89,6 @@ stdenv.mkDerivation rec {
|
||||||
sasl
|
sasl
|
||||||
curl
|
curl
|
||||||
xmlrpc_c
|
xmlrpc_c
|
||||||
pkg-config
|
|
||||||
ding-libs
|
ding-libs
|
||||||
p11-kit
|
p11-kit
|
||||||
python3
|
python3
|
||||||
|
|
|
@ -37,7 +37,7 @@ in buildNpmPackage {
|
||||||
buildInputs = [ util-linux ];
|
buildInputs = [ util-linux ];
|
||||||
|
|
||||||
dontNpmBuild = true;
|
dontNpmBuild = true;
|
||||||
npmInstallFlags = "--only-production";
|
npmInstallFlags = [ "--only-production" ];
|
||||||
npmDepsHash = "sha256-0PFeXiS8RSffhrocrHODNpb6d9+nbpulCW5qYIrytDI=";
|
npmDepsHash = "sha256-0PFeXiS8RSffhrocrHODNpb6d9+nbpulCW5qYIrytDI=";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ bison flex ] ++
|
nativeBuildInputs = [ bison flex ] ++
|
||||||
lib.optional stdenv.hostPlatform.isDarwin [
|
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.DiskArbitration
|
darwin.apple_sdk.frameworks.DiskArbitration
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue