From c4afa32b296473c2b01f4b4346da4a55db155a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Thu, 2 Apr 2020 11:24:12 +0200
Subject: [PATCH 1/2] llvmPackages_latest: llvm9->llvm10

since llvm10 is now the newest release
now throws an error if llvm-polly or clang-polly is build, since polly
is enabled by default.
---
 pkgs/top-level/all-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5a0e81f4a7..e0a6ab94ee4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7994,8 +7994,9 @@ in
       useMacosReexportHack = true;
     };
   };
-  llvm-polly = llvmPackages_latest.llvm-polly;
-  clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
+
+  llvm-polly = throw "clang is now built with polly-plugin by default";
+  clang-polly = throw "clang is now built with polly-plugin by default";
 
   clang_10 = llvmPackages_10.clang;
   clang_9  = llvmPackages_9.clang;
@@ -8792,7 +8793,7 @@ in
     stdenv = gcc7Stdenv;
   });
 
-  llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC
+  llvmPackages_latest = llvmPackages_10;
 
   lorri = callPackage ../tools/misc/lorri {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;

From 671733227c51564aa390fcaf56d36f5716025b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Mon, 13 Apr 2020 14:27:51 +0200
Subject: [PATCH 2/2] {llvm,polly}-polly: moved to aliases.nix

---
 pkgs/top-level/aliases.nix      | 5 +++++
 pkgs/top-level/all-packages.nix | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 88e7d4d9e84..86ae0e0b258 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -631,6 +631,11 @@ mapAliases ({
   clang_35 = llvm_4;
   clang_4 = llvm_4;
 
+  # added 2019-04-13
+  # *-polly pointed to llvmPackages_latest
+  llvm-polly = throw "clang is now built with polly-plugin by default";
+  clang-polly = throw "clang is now built with polly-plugin by default";
+
   /* Cleanup before 20.09 */
   oraclejdk8psu = throw ''
     The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a6ab94ee4..51e7404d8a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7995,9 +7995,6 @@ in
     };
   };
 
-  llvm-polly = throw "clang is now built with polly-plugin by default";
-  clang-polly = throw "clang is now built with polly-plugin by default";
-
   clang_10 = llvmPackages_10.clang;
   clang_9  = llvmPackages_9.clang;
   clang_8  = llvmPackages_8.clang;