snapcraft: 8.3.3 -> 8.4.1

This commit is contained in:
Jon Seager 2024-10-04 11:30:24 +01:00
parent ff9665dd8d
commit 83be384908
No known key found for this signature in database

View File

@ -5,37 +5,14 @@
lib, lib,
makeWrapper, makeWrapper,
nix-update-script, nix-update-script,
python3, python3Packages,
squashfsTools, squashfsTools,
stdenv, stdenv,
}: }:
let python3Packages.buildPythonApplication rec {
python = python3.override {
self = python;
packageOverrides = self: super: {
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
version = "0.11.2";
src = fetchFromGitHub {
owner = "NowanIlfideme";
repo = "pydantic-yaml";
rev = "refs/tags/v${version}";
hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY=";
};
dependencies = with self; [
deprecated
importlib-metadata
pydantic_1
ruamel-yaml
types-deprecated
];
});
};
};
in
python.pkgs.buildPythonApplication rec {
pname = "snapcraft"; pname = "snapcraft";
version = "8.3.3"; version = "8.4.1";
pyproject = true; pyproject = true;
@ -43,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
owner = "canonical"; owner = "canonical";
repo = "snapcraft"; repo = "snapcraft";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-xE+5nYvXawl9HjeBI9ogwyYAVCj/sPoMCVfEeZL5vN4="; hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c=";
}; };
patches = [ patches = [
@ -93,7 +70,7 @@ python.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
dependencies = with python.pkgs; [ dependencies = with python3Packages; [
attrs attrs
catkin-pkg catkin-pkg
click click
@ -102,6 +79,7 @@ python.pkgs.buildPythonApplication rec {
craft-cli craft-cli
craft-grammar craft-grammar
craft-parts craft-parts
craft-platforms
craft-providers craft-providers
craft-store craft-store
debian debian
@ -136,7 +114,7 @@ python.pkgs.buildPythonApplication rec {
validators validators
]; ];
build-system = with python.pkgs; [ setuptools ]; build-system = with python3Packages; [ setuptools ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"docutils" "docutils"
@ -151,7 +129,7 @@ python.pkgs.buildPythonApplication rec {
''; '';
nativeCheckInputs = nativeCheckInputs =
with python.pkgs; with python3Packages;
[ [
pytest-check pytest-check
pytest-cov-stub pytest-cov-stub