From ef2e2f87283d3c35122fb44497fc3b7e91e9ca6c Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 25 Oct 2024 00:35:38 +1300 Subject: [PATCH] Patch upper bounds --- overlays/bootstrap.nix | 9 +++---- .../ghc/ghc-9.8.3-text-upper-bound.patch | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 overlays/patches/ghc/ghc-9.8.3-text-upper-bound.patch diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix index 38cb77431..6edb41288 100644 --- a/overlays/bootstrap.nix +++ b/overlays/bootstrap.nix @@ -255,10 +255,11 @@ in { ++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch) ++ onWindowsOrMusl (fromUntil "9.6" "9.7" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch) ++ onWindowsOrMusl (fromUntil "9.8.2" "9.11" ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols-2.patch) - ++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch - ++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch - ++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch - ++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch + ++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch + ++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch + ++ fromUntil "9.8.3" "9.10" ./patches/ghc/ghc-9.8.3-text-upper-bound.patch + ++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch + ++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch # This patch will make windows stop emitting absolute relocations. This is one way in which binutils 2.36+ (with ASLR enabled), will just choke on the # assembly we generate because it's always absolute (32bit) addressing modes. diff --git a/overlays/patches/ghc/ghc-9.8.3-text-upper-bound.patch b/overlays/patches/ghc/ghc-9.8.3-text-upper-bound.patch new file mode 100644 index 000000000..9a78784da --- /dev/null +++ b/overlays/patches/ghc/ghc-9.8.3-text-upper-bound.patch @@ -0,0 +1,24 @@ +diff --git a/linters/lint-commit-msg/lint-commit-msg.cabal b/linters/lint-commit-msg/lint-commit-msg.cabal +index 7d1dbd0fcb..861ad6f03d 100644 +--- a/linters/lint-commit-msg/lint-commit-msg.cabal ++++ b/linters/lint-commit-msg/lint-commit-msg.cabal +@@ -26,4 +26,4 @@ executable lint-commit-msg + base + >= 4.14 && < 5, + text +- >= 1.2 && < 2.1 ++ >= 1.2 && < 2.2 +diff --git a/linters/lint-submodule-refs/lint-submodule-refs.cabal b/linters/lint-submodule-refs/lint-submodule-refs.cabal +index ce4012adfc..9ff85d2731 100644 +--- a/linters/lint-submodule-refs/lint-submodule-refs.cabal ++++ b/linters/lint-submodule-refs/lint-submodule-refs.cabal +@@ -15,7 +15,7 @@ executable lint-submodule-refs + base + >= 4.14 && < 5, + text +- >= 1.2 && < 2.1, ++ >= 1.2 && < 2.2, + linters-common + + ghc-options: +