mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 01:24:47 +00:00
snapcraft: do catch conflicts
This commit is contained in:
parent
1ed734c6c1
commit
b969054329
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user