diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-16 00:13:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 00:13:54 +0000 |
| commit | dd816c8cfd5b1db54ad070c3c64279ad35e4d0d1 (patch) | |
| tree | 5ada0bad4cd1a653230f87d4566b5309b68796ef /pkgs/build-support | |
| parent | 066aaaf12175afd0fe2c04ddbe016897a94fd4ae (diff) | |
| parent | 383cd683b68f00e24ebd3bedba6eb8d8a20f9265 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-setupcfg/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/build-support/dotnet/make-nuget-source/default.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e6..5737989249af4 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,8 +6,8 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true }: let +lib: pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true}: let build = if application then pythonPackages.buildPythonApplication else pythonPackages.buildPythonPackage; @@ -18,7 +18,8 @@ in build { nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ - (if doCheck then (info.tests_require or []) else [])); + (lib.optionals doCheck (info.tests_require or [])) + ); propagatedBuildInputs = map (p: pythonPackages.${p}) (info.install_requires or []); diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index 8dc77f3aac03a..ea1c5328082d5 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -30,9 +30,7 @@ let meta.licence = let depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); in (lib.flatten (lib.forEach depLicenses (spdx: - if (spdx != "") - then lib.getLicenseFromSpdxId spdx - else [] + lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) ))); }; in nuget-source |