From b969054329041914713d30cf0f8bf74190d3b60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 08:07:51 -0700
Subject: [PATCH] snapcraft: do catch conflicts

---
 pkgs/by-name/sn/snapcraft/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 073a4e4f32b1..396d81826841 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,6 +13,7 @@
 let
   python = python3.override {
     packageOverrides = self: super: {
+      pydantic = self.pydantic_1;
       pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
         version = "0.11.2";
         src = fetchFromGitHub {
@@ -29,6 +30,10 @@ let
           types-deprecated
         ];
       });
+      versioningit = super.versioningit.overridePythonAttrs (old: rec {
+        # incompatible with pydantic_1
+        doCheck = false;
+      });
     };
   };
 in
@@ -38,11 +43,6 @@ python.pkgs.buildPythonApplication rec {
 
   pyproject = true;
 
-  # Somewhere deep in the dependency tree is 'versioningit', which depends
-  # on pydantic 2. Snapcraft will soon migrate to pydantic 2, and disabling
-  # this doesn't seem to affect the functionality of the application.
-  catchConflicts = false;
-
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "snapcraft";