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 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