Unverified Commit c12ea496 authored by Jon Seager's avatar Jon Seager Committed by GitHub
Browse files

snapcraft: 8.4.1 -> 8.5.0 (#357518)

parents 14f4fef8 4f0776b1

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

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


python3Packages.buildPythonApplication rec {

  pname = "snapcraft";

  version = "8.4.1";

  version = "8.5.0";



  pyproject = true;
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { 
    owner = "canonical";

    repo = "snapcraft";

    rev = "refs/tags/${version}";

    hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c=";

    hash = "sha256-u5LO29LnAJrU8fafa1EA4ii5g8sO8REfuf/7lzI7x5k=";

  };



  patches = [
@@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec { 
    pyyaml

    raven

    requests-toolbelt

    requests-unixsocket

    requests-unixsocket2

    simplejson

    snap-helpers

    tabulate

pkgs/development/python-modules/craft-application/default.nix

+9 −3
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ 
  craft-cli,

  craft-grammar,

  craft-parts,

  craft-platforms,

  craft-providers,

  jinja2,

  fetchFromGitHub,

  git,

  hypothesis,
@@ -23,11 +25,12 @@ 
  responses,

  setuptools-scm,

  snap-helpers,

  freezegun,

}:



buildPythonPackage rec {

  pname = "craft-application";

  version = "4.2.5";

  version = "4.4.0";

  pyproject = true;



  disabled = pythonOlder "3.10";
@@ -36,12 +39,12 @@ buildPythonPackage rec { 
    owner = "canonical";

    repo = "craft-application";

    rev = "refs/tags/${version}";

    hash = "sha256-Y/Eci0ByE1HxUcxWhpQq0F2Ef1xkXZMBDGmUSIyPKII=";

    hash = "sha256-Sb7/p5g03stipnvfE5FceXv6xDA4c45qnxllBUWhmY8=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail "setuptools==74.1.1" "setuptools"

      --replace-fail "setuptools==75.2.0" "setuptools"

  '';



  build-system = [ setuptools-scm ];
@@ -56,7 +59,9 @@ buildPythonPackage rec { 
    craft-cli

    craft-grammar

    craft-parts

    craft-platforms

    craft-providers

    jinja2

    license-expression

    pygit2

    pyyaml
@@ -64,6 +69,7 @@ buildPythonPackage rec { 
  ];



  nativeCheckInputs = [

    freezegun

    git

    hypothesis

    pyfakefs

pkgs/development/python-modules/craft-cli/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


buildPythonPackage rec {

  pname = "craft-cli";

  version = "2.7.0";

  version = "2.10.1";



  pyproject = true;
@@ -21,12 +21,12 @@ buildPythonPackage rec { 
    owner = "canonical";

    repo = "craft-cli";

    rev = "refs/tags/${version}";

    hash = "sha256-PNurNP0ghG/R0rcUc5GfuPM5PTt+9FbJRjs61YJ1ytc=";

    hash = "sha256-XKRV5VJLC3B5gcNr/icOxWB6pDXDT7MV5wM/vEQHVm4=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail "setuptools==70.1.0" "setuptools"

      --replace-fail "setuptools==75.2.0" "setuptools"

  '';



  build-system = [ setuptools-scm ];

pkgs/development/python-modules/craft-providers/default.nix

+3 −6
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  pyyaml,

  requests-unixsocket,

  setuptools-scm,

  urllib3,

  pytest-check,

  pytest-mock,

  pytestCheckHook,
@@ -21,7 +20,7 @@ 


buildPythonPackage rec {

  pname = "craft-providers";

  version = "2.0.3";

  version = "2.0.4";



  pyproject = true;
@@ -29,7 +28,7 @@ buildPythonPackage rec { 
    owner = "canonical";

    repo = "craft-providers";

    rev = "refs/tags/${version}";

    hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk=";

    hash = "sha256-f+0AEoVUFL/+v4sRYirc6OD5dYH4dlLk8h7im+CLuhM=";

  };



  patches = [
@@ -51,8 +50,7 @@ buildPythonPackage rec { 
    # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69

    # This is already patched in nixpkgs.

    substituteInPlace pyproject.toml \

      --replace-fail "setuptools==73.0.1" "setuptools" \

      --replace-fail "urllib3<2" "urllib3"

      --replace-fail "setuptools==73.0.1" "setuptools"

  '';



  pythonRelaxDeps = [ "requests" ];
@@ -65,7 +63,6 @@ buildPythonPackage rec { 
    pydantic

    pyyaml

    requests-unixsocket

    urllib3

  ];



  pythonImportsCheck = [ "craft_providers" ];