diff options
author | Artturi <Artturin@artturin.com> | 2023-09-06 23:44:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-06 23:44:14 +0300 |
commit | de42a231a4ec05c9c5d28d6db85010f8021e28e9 (patch) | |
tree | e493338642d8d9884d03681880424a7ff937966e | |
parent | efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4 (diff) | |
parent | 39cabe4c890e6be90c2787915a946f0dcccc4764 (diff) | |
download | nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar.gz nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar.bz2 nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar.lz nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar.xz nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.tar.zst nixlib-de42a231a4ec05c9c5d28d6db85010f8021e28e9.zip |
Merge pull request #236203 from SharzyL/llvm_no_extend
-rw-r--r-- | pkgs/development/compilers/llvm/10/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/11/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/13/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/14/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/15/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/16/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/8/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/9/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 3 |
13 files changed, 26 insertions, 13 deletions
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 44791f09e384..c1ea3a86342f 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -279,5 +279,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 2fd510942df9..acb649cdab0b 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -294,5 +294,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index d7fa0517815c..e390149f0dad 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -294,5 +294,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 42dfd2551779..0432dcd14316 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -316,5 +316,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 5a7651958027..75a52b609605 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -314,5 +314,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index a9fee13d12b0..f244987353b9 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -387,5 +387,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index d9a363037a92..94d0e7d30b58 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -400,5 +400,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index f81aecb0eebc..70f0d2e11bb6 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -135,5 +135,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 601242439606..3dcc75023f4f 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -136,5 +136,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index b9c167a71444..5c20086ce846 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -283,5 +283,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index f5bc6c018a80..c24c84754e32 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -282,5 +282,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index dfe1dbeb21d8..4ec802a4f289 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -282,5 +282,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 5ec5d35dcec5..04f17d5edab6 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -362,5 +362,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) |