Merge pull request #241473 from mweinelt/22.11-eol

NixOS 22.11 EOL cleanup
NixOS · Jul 4, 2023 · c6fb584 · c6fb584
2 parents 235f275 + c31bda5
commit c6fb584
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
@@ -34,10 +34,6 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-22.11
-            into: staging-next-22.11
-          - from: staging-next-22.11
-            into: staging-22.11
           - from: release-23.05
             into: staging-next-23.05
           - from: staging-next-23.05

diff --git a/lib/trivial.nix b/lib/trivial.nix
@@ -179,7 +179,7 @@ rec {
      they take effect as soon as the oldest release reaches end of life. */
   oldestSupportedRelease =
     # Update on master only. Do not backport.
-    2211;
+    2305;
 
   /* Whether a feature is supported in all supported releases (at the time of
      release branch-off, if applicable). See `oldestSupportedRelease`. */