diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-19 00:02:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 00:02:55 +0000 |
| commit | 733c1988b719aea4ac4b10c579cb2ca94852ab04 (patch) | |
| tree | 11b4e7a7c6cb23b99fdee471df70c1157a757ded /pkgs/build-support | |
| parent | a7324a2bde2ca2e9fa54d552a60ef3e9f930a1f7 (diff) | |
| parent | f9d582c9dfe20a6c5e1743847d6cf723a5d14a66 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders/default.nix | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e4dcb81346697..84c5a78b877bf 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -120,6 +120,7 @@ let znver1 = versionAtLeast ccVersion "6.0"; znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; + znver4 = versionAtLeast ccVersion "13.0"; }.${arch} or true else if isClang then { # Intel @@ -130,6 +131,8 @@ let # AMD znver1 = versionAtLeast ccVersion "4.0"; znver2 = versionAtLeast ccVersion "9.0"; + znver3 = versionAtLeast ccVersion "12.0"; + znver4 = versionAtLeast ccVersion "16.0"; }.${arch} or true else false; diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index d3cb22a1f5351..2af36008c7a51 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -87,6 +87,10 @@ rec { inherit buildCommand name; passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or []); + pos = let args = builtins.attrNames derivationArgs; in + if builtins.length args > 0 + then builtins.unsafeGetAttrPos (builtins.head args) derivationArgs + else null; } // (lib.optionalAttrs runLocal { preferLocalBuild = true; |