From 39cabe4c890e6be90c2787915a946f0dcccc4764 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Tue, 6 Jun 2023 12:56:13 +0800 Subject: llvmPackages: remove `extend` attribute --- pkgs/development/compilers/llvm/10/default.nix | 3 ++- pkgs/development/compilers/llvm/11/default.nix | 3 ++- pkgs/development/compilers/llvm/12/default.nix | 3 ++- pkgs/development/compilers/llvm/13/default.nix | 3 ++- pkgs/development/compilers/llvm/14/default.nix | 3 ++- pkgs/development/compilers/llvm/15/default.nix | 3 ++- pkgs/development/compilers/llvm/16/default.nix | 3 ++- pkgs/development/compilers/llvm/5/default.nix | 3 ++- pkgs/development/compilers/llvm/6/default.nix | 3 ++- pkgs/development/compilers/llvm/7/default.nix | 3 ++- pkgs/development/compilers/llvm/8/default.nix | 3 ++- pkgs/development/compilers/llvm/9/default.nix | 3 ++- 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 4964d405d32e..2454c925e601 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -274,5 +274,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 a94b9d64d49b..678bc67e2c3e 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -289,5 +289,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 512a576d6f5d..27cfd39bd479 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/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/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index f51f33cf9dbf..446eb2157b3b 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -291,5 +291,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 cf3cf1133e58..c9fb6b43ee16 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -289,5 +289,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 0e36ebb8abbb..fc89e2758081 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/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) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 1304ef2bdbc0..2fa76af3df11 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/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) 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 8cf311e9b23a..d01f212962c2 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -349,5 +349,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) -- cgit 1.4.1