Unverified Commit 137bd86c authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

charmcraft: 3.2.2 -> 3.4.2 (#381233)

parents a4aadaa4 b4c51dce

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

+6 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


python3Packages.buildPythonApplication rec {

  pname = "charmcraft";

  version = "3.2.2";

  version = "3.4.2";



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

    repo = "charmcraft";

    tag = version;

    hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";

    hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk=";

  };



  postPatch = ''
@@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { 
    humanize

    jinja2

    jsonschema

    pip

    pydantic

    python-dateutil

    pyyaml
@@ -51,11 +52,14 @@ python3Packages.buildPythonApplication rec { 
  pythonRelaxDeps = [

    "urllib3"

    "craft-application"

    "pip"

    "pydantic"

  ];



  nativeCheckInputs =

    with python3Packages;

    [

      freezegun

      hypothesis

      pyfakefs

      pytest-check

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

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


python3Packages.buildPythonApplication rec {

  pname = "rockcraft";

  version = "1.7.0";

  version = "1.8.0";



  src = fetchFromGitHub {

    owner = "canonical";

    repo = "rockcraft";

    rev = version;

    hash = "sha256-2Bo3qtpSSfNvqszlt9cCc9/rurDNDMySAaqLbvRmjjw=";

    hash = "sha256-v7biDGgJoQO6cKRXG8xosCgd/mlOUEwHrqcgtL2R5L4=";

  };



  pyproject = true;

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

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/snapcraft/utils.py b/snapcraft/utils.py

index 999a64ec..4f38b4cd 100644

--- a/snapcraft/utils.py

+++ b/snapcraft/utils.py

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

     release = platform.release()

     machine = platform.machine()

 

-    if system == "Linux":

+    if system == "Linux" and "NixOS" not in platform.version():

         try:

             with filepath.open("rt", encoding="utf-8") as release_file:

                 lines = release_file.readlines()

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

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


python3Packages.buildPythonApplication rec {

  pname = "snapcraft";

  version = "8.5.1";

  version = "8.6.1";



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

    repo = "snapcraft";

    tag = version;

    hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA=";

    hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ=";

  };



  patches = [
@@ -29,11 +29,6 @@ python3Packages.buildPythonApplication rec { 
    # path for LXD must be adjusted so that it's at the correct location for LXD

    # on NixOS. This patch will likely never be accepted upstream.

    ./lxd-socket-path.patch

    # In certain places, Snapcraft expects an /etc/os-release file to determine

    # host info which doesn't exist in our test environment. This is a

    # relatively naive patch which helps the test suite pass - without it *many*

    # of the tests fail. This patch will likely never be accepted upstream.

    ./os-platform.patch

    # Snapcraft will try to inject itself as a snap *from the host system* into

    # the build system. This patch short-circuits that logic and ensures that

    # Snapcraft is installed on the build system from the snap store - because
@@ -118,6 +113,7 @@ python3Packages.buildPythonApplication rec { 
  build-system = with python3Packages; [ setuptools ];



  pythonRelaxDeps = [

    "craft-parts"

    "docutils"

    "jsonschema"

    "pygit2"

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

+3 −5
Original line number Diff line number Diff line
@@ -30,21 +30,19 @@ 


buildPythonPackage rec {

  pname = "craft-application";

  version = "4.8.2";

  version = "4.9.0";

  pyproject = true;



  disabled = pythonOlder "3.10";



  src = fetchFromGitHub {

    owner = "canonical";

    repo = "craft-application";

    tag = version;

    hash = "sha256-rKeEi9z5eQfjn0Q4FR6CVIz9YDS7Ejg4cqcor5wtz0s=";

    hash = "sha256-DprItAuGjw8AACeJDrIa6KIWLSyImuWI0qeROpPohtM=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

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

      --replace-fail "setuptools==75.8.0" "setuptools"

  '';



  build-system = [ setuptools-scm ];