From 0e349bdc7688e01944c995b0bac756f7bc72ffec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 04:57:20 +0200
Subject: [PATCH 1/2] python3Packages.django_5_2: 5.2.1 -> 5.2.2

https://docs.djangoproject.com/en/5.2/releases/5.2.2/
https://www.djangoproject.com/weblog/2025/jun/04/security-releases/

Fixes: CVE-2025-48432
---
 pkgs/development/python-modules/django/5_2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 384a7040ea95..bc7d06c3dfb4 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.1";
+  version = "5.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-JmO2IEWrpA7/FXOwESLvIIuHmi2HQgvg28LVNmBXgLA=";
+    hash = "sha256-x5PTE8oYA1VzErYXfuRzT4xNiMRnfEd6H9lEtB+HBkc=";
   };
 
   patches =

From 3fdac78c28427afd3d2a52872439999d4e06d870 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 05:36:17 +0200
Subject: [PATCH 2/2] nixosTests: migrate `mc config host add` to `mc alias
 set`

The former command was deprecated in 2020 and removed in one of the last
releases.
---
 nixos/tests/atticd.nix                     | 2 +-
 nixos/tests/nextcloud/with-objectstore.nix | 2 +-
 nixos/tests/outline.nix                    | 2 +-
 nixos/tests/thanos.nix                     | 2 +-
 nixos/tests/web-apps/lasuite-docs.nix      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/atticd.nix b/nixos/tests/atticd.nix
index 4193d75d2a92..dd0790fe65e7 100644
--- a/nixos/tests/atticd.nix
+++ b/nixos/tests/atticd.nix
@@ -78,7 +78,7 @@ in
           s3.wait_for_unit("minio.service")
           s3.wait_for_open_port(9000)
           s3.succeed(
-              "mc config host add minio "
+              "mc alias set minio "
               + "http://localhost:9000 "
               + "${accessKey} ${secretKey} --api s3v4",
               "mc mb minio/attic",
diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix
index 53800b8238bc..c652df46b1c4 100644
--- a/nixos/tests/nextcloud/with-objectstore.nix
+++ b/nixos/tests/nextcloud/with-objectstore.nix
@@ -126,7 +126,7 @@ runTest (
 
         with subtest("Check if file is in S3"):
             nextcloud.succeed(
-                "mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
+                "mc alias set minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
             )
             files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n')
 
diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix
index e2691c205056..58c751d66f78 100644
--- a/nixos/tests/outline.nix
+++ b/nixos/tests/outline.nix
@@ -44,7 +44,7 @@ in
 
     # Create a test bucket on the server
     machine.succeed(
-        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
+        "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
     )
     machine.succeed("mc mb minio/outline")
 
diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix
index bfdee16a6f9b..c0c10854e73f 100644
--- a/nixos/tests/thanos.nix
+++ b/nixos/tests/thanos.nix
@@ -234,7 +234,7 @@ import ./make-test-python.nix {
       s3.wait_for_unit("minio.service")
       s3.wait_for_open_port(${toString minioPort})
       s3.succeed(
-          "mc config host add minio "
+          "mc alias set minio "
           + "http://localhost:${toString minioPort} "
           + "${s3.accessKey} ${s3.secretKey} --api s3v4",
           "mc mb minio/thanos-bucket",
diff --git a/nixos/tests/web-apps/lasuite-docs.nix b/nixos/tests/web-apps/lasuite-docs.nix
index 49af73a7f604..42629ebba9d6 100644
--- a/nixos/tests/web-apps/lasuite-docs.nix
+++ b/nixos/tests/web-apps/lasuite-docs.nix
@@ -141,7 +141,7 @@ in
       machine.wait_for_unit("lasuite-docs-collaboration-server.service")
 
     with subtest("Create S3 bucket"):
-      machine.succeed("mc config host add minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
+      machine.succeed("mc alias set minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
       machine.succeed("mc mb lasuite-docs")
 
     with subtest("Wait for web servers to start"):