Unverified Commit 6af55cb9 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #325601 from r-ryantm/auto-update/python312Packages.craft-providers

parents 24cefb01 de97b31f

pkgs/by-name/ch/charmcraft/package.nix

+17 −14
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ python3Packages.buildPythonApplication rec { 
  postPatch = ''

    substituteInPlace setup.py \

      --replace-fail 'version=determine_version()' 'version="${version}"'



    substituteInPlace charmcraft/env.py \

      --replace-fail "distutils.util" "setuptools.dist"

  '';



  propagatedBuildInputs = with python3Packages; [
@@ -44,22 +47,22 @@ python3Packages.buildPythonApplication rec { 
    urllib3

  ];



  nativeBuildInputs = with python3Packages; [

    setuptools

  ];

  nativeBuildInputs = with python3Packages; [ setuptools ];



  pythonRelaxDeps = [

    "urllib3"

  ];

  pythonRelaxDeps = [ "urllib3" ];



  nativeCheckInputs = with python3Packages; [

  nativeCheckInputs =

    with python3Packages;

    [

      pyfakefs

      pytest-check

      pytest-mock

      pytest-subprocess

      pytestCheckHook

      responses

  ] ++ [ git ];

      setuptools

    ]

    ++ [ git ];



  preCheck = ''

    mkdir -p check-phase

pkgs/by-name/ro/rockcraft/package.nix

+20 −14
Original line number Diff line number Diff line 
{ lib

, python3Packages

, fetchFromGitHub

, dpkg

, nix-update-script

, python3

{

  lib,

  python3Packages,

  fetchFromGitHub,

  dpkg,

  nix-update-script,

  python3,

}:



python3Packages.buildPythonApplication rec {
@@ -20,6 +21,9 @@ python3Packages.buildPythonApplication rec { 
  postPatch = ''

    substituteInPlace rockcraft/__init__.py \

      --replace-fail "dev" "${version}"



    substituteInPlace rockcraft/utils.py \

      --replace-fail "distutils.util" "setuptools.dist"

  '';



  propagatedBuildInputs = with python3Packages; [
@@ -28,14 +32,16 @@ python3Packages.buildPythonApplication rec { 
    spdx-lookup

  ];



  nativeCheckInputs = with python3Packages; [

  nativeCheckInputs =

    with python3Packages;

    [

      pytest-check

      pytest-mock

      pytest-subprocess

      pytestCheckHook

  ] ++ [

    dpkg

  ];

      setuptools

    ]

    ++ [ dpkg ];



  preCheck = ''

    mkdir -p check-phase

pkgs/by-name/sn/snapcraft/os-platform.patch

+2 −10
Original line number Diff line number Diff line 
diff --git a/snapcraft/utils.py b/snapcraft/utils.py

index 511effe2..4af5a029 100644

index 999a64ec..4f38b4cd 100644

--- a/snapcraft/utils.py

+++ b/snapcraft/utils.py

@@ -15,6 +15,7 @@

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 

 """Utilities for snapcraft."""

+

 import multiprocessing

 import os

 import pathlib

@@ -91,7 +92,7 @@ def get_os_platform(

@@ -94,7 +94,7 @@ def get_os_platform(

     release = platform.release()

     machine = platform.machine()

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

+22 −19
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
}:

python3Packages.buildPythonApplication rec {

  pname = "snapcraft";

  version = "8.2.5";

  version = "8.2.12";



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

    repo = "snapcraft";

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

    hash = "sha256-+1Gzseuq402m5FvlRAGXl7Lsy2VnRmd1cXNXhkMDDDE=";

    hash = "sha256-1PwIbMweeYGi+jLfhFB3LYThqaN2VW7zdyzjD1m57ow=";

  };



  patches = [
@@ -67,6 +67,9 @@ python3Packages.buildPythonApplication rec { 
    substituteInPlace snapcraft/elf/elf_utils.py \

      --replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \

      'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))'



    substituteInPlace snapcraft_legacy/internal/xattrs.py \

      --replace-fail 'distutils.util' 'setuptools.dist'

  '';



  buildInputs = [ makeWrapper ];
@@ -104,9 +107,7 @@ python3Packages.buildPythonApplication rec { 
    tinydb

  ];



  nativeBuildInputs = with python3Packages; [

    setuptools

  ];

  nativeBuildInputs = with python3Packages; [ setuptools ];



  pythonRelaxDeps = [

    "docutils"
@@ -119,14 +120,18 @@ python3Packages.buildPythonApplication rec { 
    wrapProgram $out/bin/snapcraft --prefix PATH : ${squashfsTools}/bin

  '';



  nativeCheckInputs = with python3Packages; [

  nativeCheckInputs =

    with python3Packages;

    [

      pytest-check

      pytest-cov

      pytest-mock

      pytest-subprocess

      pytestCheckHook

      responses

  ] ++ [

      setuptools

    ]

    ++ [

      git

      squashfsTools

    ];
@@ -160,9 +165,7 @@ python3Packages.buildPythonApplication rec { 
    "test_snap_command_fallback"

    "test_validate_architectures_supported"

    "test_validate_architectures_unsupported"

  ] ++ lib.optionals stdenv.isAarch64 [

    "test_load_project"

  ];

  ] ++ lib.optionals stdenv.isAarch64 [ "test_load_project" ];



  disabledTestPaths = [

    "tests/unit/commands/test_remote.py"

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


buildPythonPackage rec {

  pname = "craft-providers";

  version = "1.24.0";

  version = "1.24.1";



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

    repo = "craft-providers";

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

    hash = "sha256-CkaJ8taTsnBpCffe/Eu4/FGpMwKcg3yeLVAahCyEsII=";

    hash = "sha256-l57Y+sdCD0/3sBK48N/3p3ns3o0LB4h9FQ35ha1AOV4=";

  };



  patches = [