From 1ad976ab10eb817db5b80b7e72097bb61119ff5f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 5 May 2025 21:08:34 +0200
Subject: [PATCH 1/2] top-level/python-packages: run keep-sorted

---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c04b7d762985..1b943ebc0219 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1993,6 +1993,8 @@ self: super: with self; {
 
   boschshcpy = callPackage ../development/python-modules/boschshcpy { };
 
+  bot-safe-agents = callPackage ../development/python-modules/bot-safe-agents { };
+
   boto3 = callPackage ../development/python-modules/boto3 { };
 
   boto3-stubs = callPackage ../development/python-modules/boto3-stubs { };
@@ -2009,8 +2011,6 @@ self: super: with self; {
 
   bottombar = callPackage ../development/python-modules/bottombar { };
 
-  bot-safe-agents = callPackage ../development/python-modules/bot-safe-agents { };
-
   bpemb = callPackage ../development/python-modules/bpemb { };
 
   bpylist2 = callPackage ../development/python-modules/bpylist2 { };
@@ -5863,8 +5863,6 @@ self: super: with self; {
 
   gophish = callPackage ../development/python-modules/gophish { };
 
-  gotify = callPackage ../development/python-modules/gotify { };
-
   gorilla = callPackage ../development/python-modules/gorilla { };
 
   goslide-api = callPackage ../development/python-modules/goslide-api { };
@@ -5873,6 +5871,8 @@ self: super: with self; {
 
   gotenberg-client = callPackage ../development/python-modules/gotenberg-client { };
 
+  gotify = callPackage ../development/python-modules/gotify { };
+
   govee-ble = callPackage ../development/python-modules/govee-ble { };
 
   govee-led-wez = callPackage ../development/python-modules/govee-led-wez { };
@@ -11240,10 +11240,10 @@ self: super: with self; {
 
   ploomber-extension = callPackage ../development/python-modules/ploomber-extension { };
 
-  plotille = callPackage ../development/python-modules/plotille { };
-
   plotext = callPackage ../development/python-modules/plotext { };
 
+  plotille = callPackage ../development/python-modules/plotille { };
+
   plotly = callPackage ../development/python-modules/plotly { };
 
   plotnine = callPackage ../development/python-modules/plotnine { };
@@ -11533,12 +11533,12 @@ self: super: with self; {
 
   proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { };
 
+  proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { };
+
   proton-vpn-network-manager =
     callPackage ../development/python-modules/proton-vpn-network-manager
       { };
 
-  proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { };
-
   protonup-ng = callPackage ../development/python-modules/protonup-ng { };
 
   protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
@@ -13782,10 +13782,10 @@ self: super: with self; {
 
   pytest-reverse = callPackage ../development/python-modules/pytest-reverse { };
 
-  pytest-run-parallel = callPackage ../development/python-modules/pytest-run-parallel { };
-
   pytest-ruff = callPackage ../development/python-modules/pytest-ruff { };
 
+  pytest-run-parallel = callPackage ../development/python-modules/pytest-run-parallel { };
+
   pytest-scim2-server = callPackage ../development/python-modules/pytest-scim2-server { };
 
   pytest-selenium = callPackage ../development/python-modules/pytest-selenium { };
@@ -16315,10 +16315,10 @@ self: super: with self; {
 
   sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { };
 
-  sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
-
   sphinx-remove-toctrees = callPackage ../development/python-modules/sphinx-remove-toctrees { };
 
+  sphinx-reredirects = callPackage ../development/python-modules/sphinx-reredirects { };
+
   sphinx-rtd-dark-mode = callPackage ../development/python-modules/sphinx-rtd-dark-mode { };
 
   sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { };

From b36d85b7316a5d3b92f918a6e6f234fbed0183f0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 5 May 2025 21:09:33 +0200
Subject: [PATCH 2/2] workflows/keep-sorted: make it fail

This never worked as intended, because it relies on "-o pipefail", which
is not set in GitHub Actions by default. It will be set when explicitly
selecting the shell as bash, though.

https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
---
 .github/workflows/keep-sorted.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml
index b23295a23af4..8c7688ad42e3 100644
--- a/.github/workflows/keep-sorted.yml
+++ b/.github/workflows/keep-sorted.yml
@@ -36,5 +36,6 @@ jobs:
         run: "nix-env -f '<nixpkgs>' -iAP keep-sorted jq"
 
       - name: Check that Nix files are sorted
+        shell: bash
         run: |
           git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."'