nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapcraft: 8.4.1 -> 8.5.0 (#357518)

Browse Source
This commit is contained in:
Jon Seager 2024-11-21 08:34:33 +00:00 committed by GitHub
commit c12ea49654
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/sn/snapcraft/package.nix
View File

@ -12,7 +12,7 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "snapcraft"; pname = "snapcraft";
version = "8.4.1"; version = "8.5.0";
pyproject = true; pyproject = true;
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical"; owner = "canonical";
repo = "snapcraft"; repo = "snapcraft";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c="; hash = "sha256-u5LO29LnAJrU8fafa1EA4ii5g8sO8REfuf/7lzI7x5k=";
}; };
patches = [ patches = [
@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec {
pyyaml pyyaml
raven raven
requests-toolbelt requests-toolbelt
requests-unixsocket requests-unixsocket2
simplejson simplejson
snap-helpers snap-helpers
tabulate tabulate

12
pkgs/development/python-modules/craft-application/default.nix
View File

@ -6,7 +6,9 @@
craft-cli, craft-cli,
craft-grammar, craft-grammar,
craft-parts, craft-parts,
craft-platforms,
craft-providers, craft-providers,
jinja2,
fetchFromGitHub, fetchFromGitHub,
git, git,
hypothesis, hypothesis,
@ -23,11 +25,12 @@
responses, responses,
setuptools-scm, setuptools-scm,
snap-helpers, snap-helpers,
freezegun,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "craft-application"; pname = "craft-application";
version = "4.2.5"; version = "4.4.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -36,12 +39,12 @@ buildPythonPackage rec {
owner = "canonical"; owner = "canonical";
repo = "craft-application"; repo = "craft-application";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Y/Eci0ByE1HxUcxWhpQq0F2Ef1xkXZMBDGmUSIyPKII="; hash = "sha256-Sb7/p5g03stipnvfE5FceXv6xDA4c45qnxllBUWhmY8=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail "setuptools==74.1.1" "setuptools" --replace-fail "setuptools==75.2.0" "setuptools"
''; '';
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];
@ -56,7 +59,9 @@ buildPythonPackage rec {
craft-cli craft-cli
craft-grammar craft-grammar
craft-parts craft-parts
craft-platforms
craft-providers craft-providers
jinja2
license-expression license-expression
pygit2 pygit2
pyyaml pyyaml
@ -64,6 +69,7 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
freezegun
git git
hypothesis hypothesis
pyfakefs pyfakefs

6
pkgs/development/python-modules/craft-cli/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "craft-cli"; pname = "craft-cli";
version = "2.7.0"; version = "2.10.1";
pyproject = true; pyproject = true;
@ -21,12 +21,12 @@ buildPythonPackage rec {
owner = "canonical"; owner = "canonical";
repo = "craft-cli"; repo = "craft-cli";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-PNurNP0ghG/R0rcUc5GfuPM5PTt+9FbJRjs61YJ1ytc="; hash = "sha256-XKRV5VJLC3B5gcNr/icOxWB6pDXDT7MV5wM/vEQHVm4=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail "setuptools==70.1.0" "setuptools" --replace-fail "setuptools==75.2.0" "setuptools"
''; '';
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];

9
pkgs/development/python-modules/craft-providers/default.nix
View File

@ -9,7 +9,6 @@
pyyaml, pyyaml,
requests-unixsocket, requests-unixsocket,
setuptools-scm, setuptools-scm,
urllib3,
pytest-check, pytest-check,
pytest-mock, pytest-mock,
pytestCheckHook, pytestCheckHook,
@ -21,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "craft-providers"; pname = "craft-providers";
version = "2.0.3"; version = "2.0.4";
pyproject = true; pyproject = true;
@ -29,7 +28,7 @@ buildPythonPackage rec {
owner = "canonical"; owner = "canonical";
repo = "craft-providers"; repo = "craft-providers";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk="; hash = "sha256-f+0AEoVUFL/+v4sRYirc6OD5dYH4dlLk8h7im+CLuhM=";
}; };
patches = [ patches = [
@ -51,8 +50,7 @@ buildPythonPackage rec {
# The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69
# This is already patched in nixpkgs. # This is already patched in nixpkgs.
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace-fail "setuptools==73.0.1" "setuptools" \ --replace-fail "setuptools==73.0.1" "setuptools"
--replace-fail "urllib3<2" "urllib3"
''; '';
pythonRelaxDeps = [ "requests" ]; pythonRelaxDeps = [ "requests" ];
@ -65,7 +63,6 @@ buildPythonPackage rec {
pydantic pydantic
pyyaml pyyaml
requests-unixsocket requests-unixsocket
urllib3
]; ];
pythonImportsCheck = [ "craft_providers" ]; pythonImportsCheck = [ "craft_providers" ];