From 7ba18b2c7c03173059084a486f2c5248e8152b13 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Fri, 2 Jan 2026 22:57:15 +0100 Subject: [PATCH] rulesets/nixpkgs: remove 25.05 from merge queue branches 25.05 is EOL. --- .../nixpkgs/require-merge-queue-except-periodic-merges.json | 2 -- rulesets/nixpkgs/require-merge-queue.json | 1 - 2 files changed, 3 deletions(-) diff --git a/rulesets/nixpkgs/require-merge-queue-except-periodic-merges.json b/rulesets/nixpkgs/require-merge-queue-except-periodic-merges.json index b0d60ac..1beea85 100644 --- a/rulesets/nixpkgs/require-merge-queue-except-periodic-merges.json +++ b/rulesets/nixpkgs/require-merge-queue-except-periodic-merges.json @@ -12,8 +12,6 @@ "refs/heads/haskell-updates", "refs/heads/staging", "refs/heads/staging-next", - "refs/heads/staging-25.05", - "refs/heads/staging-next-25.05", "refs/heads/staging-nixos", "refs/heads/staging-next-25.11", "refs/heads/staging-25.11" diff --git a/rulesets/nixpkgs/require-merge-queue.json b/rulesets/nixpkgs/require-merge-queue.json index 6689399..595a91e 100644 --- a/rulesets/nixpkgs/require-merge-queue.json +++ b/rulesets/nixpkgs/require-merge-queue.json @@ -10,7 +10,6 @@ "exclude": [], "include": [ "~DEFAULT_BRANCH", - "refs/heads/release-25.05", "refs/heads/release-25.11" ] }