diff options
author | Artturi <Artturin@artturin.com> | 2022-10-13 00:08:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-13 00:08:01 +0300 |
commit | e66d2fd89d40eb37979834c934413635d0841646 (patch) | |
tree | 5df3d1319f3bd4153eaf6c7c14138a0cb1042691 /pkgs/applications/version-management | |
parent | 34493676f6616fdfb85ee76e4b7fe1c1cf0703d1 (diff) | |
parent | 7e49471316373c471a3bf4b78c130ebc907ae2d2 (diff) |
Merge pull request #194256 from Artturin/treewides2
Diffstat (limited to 'pkgs/applications/version-management')
5 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix index 65561aded31fe..cd2c26ea8d422 100644 --- a/pkgs/applications/version-management/datalad/default.nix +++ b/pkgs/applications/version-management/datalad/default.nix @@ -59,8 +59,8 @@ python3.pkgs.buildPythonApplication rec { # python>=3.8 distro - ] ++ lib.optional stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optional (python3.pythonOlder "3.10") [ importlib-metadata ]; + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ]; postInstall = '' installShellCompletion --cmd datalad \ diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 6f1c4fe185773..40b550cb9e389 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -72,17 +72,17 @@ python3.pkgs.buildPythonApplication rec { typing-extensions voluptuous zc_lockfile - ] ++ lib.optional enableGoogle [ + ] ++ lib.optionals enableGoogle [ gcsfs google-cloud-storage - ] ++ lib.optional enableAWS [ + ] ++ lib.optionals enableAWS [ aiobotocore boto3 s3fs - ] ++ lib.optional enableAzure [ + ] ++ lib.optionals enableAzure [ azure-identity knack - ] ++ lib.optional enableSSH [ + ] ++ lib.optionals enableSSH [ bcrypt ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 344a10cf2ec56..cfce8a35f9e12 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; - autoreconfFlags = "-I tools -v"; + autoreconfFlags = [ "-I" "tools" "-v" ]; buildInputs = [ ncurses readline git ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 47ca0f4f48d3c..88f2a5f4cd0e1 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -37,7 +37,7 @@ let railties = x.railties // { dontBuild = false; patches = [ ./railties-remove-yarn-install-enhancement.patch ]; - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; }; }; groups = [ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 5731ef59deb79..69a2bce490606 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -40,7 +40,7 @@ let ++ lib.optionals pythonBindings [ python3 py3c ] ++ lib.optional perlBindings perl ++ lib.optional saslSupport sasl - ++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; patches = [ ./apr-1.patch ] ++ extraPatches; |