From f5e32616832f9b056e4588334cf880091bc25c50 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:15:09 +0100
Subject: [PATCH 1/2] workflows: remove 24.05 merges

---
 .github/workflows/periodic-merge-24h.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 813d6a988efd..08570d60e1d4 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -35,10 +35,6 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-24.05
-            into: staging-next-24.05
-          - from: staging-next-24.05
-            into: staging-24.05
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11

From 2927d4b6babe4876b50bfe1036ea1b37552124a4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:15:23 +0100
Subject: [PATCH 2/2] lib/trivial: update oldestSupportedRelease

---
 lib/trivial.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 0e196018961c..d3ed7d9eda9e 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -416,7 +416,7 @@ in {
   */
   oldestSupportedRelease =
     # Update on master only. Do not backport.
-    2405;
+    2411;
 
   /**
     Whether a feature is supported in all supported releases (at the time of