Commit b9690543 authored by Robert Schütz's avatar Robert Schütz
Browse files

snapcraft: do catch conflicts

parent 1ed734c6

pkgs/by-name/sn/snapcraft/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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";