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

rockcraft: 1.9.0 -> 1.10.0 (#397326)

parents ce3f3016 9efe0c42

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

+12 −7
Original line number Diff line number Diff line
@@ -7,17 +7,18 @@ 
  testers,

  rockcraft,

  cacert,

  writableTmpDirAsHomeHook,

}:



python3Packages.buildPythonApplication rec {

  pname = "rockcraft";

  version = "1.9.0";

  version = "1.10.0";



  src = fetchFromGitHub {

    owner = "canonical";

    repo = "rockcraft";

    rev = version;

    hash = "sha256-cgNKMxQrD9/OfmY5YEnpbNDstDdXqc/wdfCb4HvsgNM=";

    hash = "sha256-LrUs6/YRQYU0o1kmNdBhafvDIyw91FnW8+9i0Jj5f+Y=";

  };



  pyproject = true;
@@ -39,20 +40,24 @@ python3Packages.buildPythonApplication rec { 
      pytest-mock

      pytest-subprocess

      pytestCheckHook

      writableTmpDirAsHomeHook

    ]

    ++ [ dpkg ];



  preCheck = ''

    mkdir -p check-phase

    export HOME="$(pwd)/check-phase"

  '';



  disabledTests = [

    "test_project_all_platforms_invalid"

    "test_run_init_flask"

    "test_run_init_django"

  ];



  disabledTestPaths = [

    # Relies upon info in the .git directory which is stripped by fetchFromGitHub,

    # and the version is overridden anyway.

    "tests/integration/test_version.py"

    # Tests non-Nix native packaging

    "tests/integration/test_setuptools.py"

  ];



  passthru = {

    updateScript = nix-update-script { };

    tests.version = testers.testVersion {

pkgs/by-name/sn/snapcraft/lxd-socket-path.patch

+4 −4
Original line number Diff line number Diff line 
diff --git a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

index 5fa4f898..41264ebb 100644

--- a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

+++ b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

diff --git i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

index 5fa4f898b..41264ebb0 100644

--- i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

+++ w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py

@@ -142,7 +142,7 @@ class LXD(Provider):

             build_provider_flags=build_provider_flags,

         )

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

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


python3Packages.buildPythonApplication rec {

  pname = "snapcraft";

  version = "8.7.3";

  version = "8.8.0";



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

    repo = "snapcraft";

    tag = version;

    hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU=";

    hash = "sha256-54UOXEH3DxT1P/CRi09gEoq9si+x/1GHFuWRIyEvz3E=";

  };



  patches = [

pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch

+6 −13
Original line number Diff line number Diff line 
diff --git a/snapcraft/providers.py b/snapcraft/providers.py

index a999537a..dcd290a7 100644

--- a/snapcraft/providers.py

+++ b/snapcraft/providers.py

@@ -21,6 +21,7 @@ import sys

 from pathlib import Path

 from textwrap import dedent

 from typing import Dict, Optional

+import platform

 

 from craft_cli import emit

 from craft_providers import Provider, ProviderError, bases, executor

@@ -178,14 +179,14 @@ def get_base_configuration(

diff --git i/snapcraft/providers.py w/snapcraft/providers.py

index 41ab6e8f1..ceaf7539b 100644

--- i/snapcraft/providers.py

+++ w/snapcraft/providers.py

@@ -177,14 +177,15 @@ def get_base_configuration(

     # injecting a snap on a non-linux system is not supported, so default to

     # install snapcraft from the store's stable channel

     snap_channel = get_managed_environment_snap_channel()

-    if sys.platform != "linux" and not snap_channel:

+    import platform

+    if snap_channel is None and (sys.platform != "linux" or "NixOS" in platform.version()):

         emit.progress(

-            "Using snapcraft from snap store channel 'latest/stable' in instance "

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

+4 −2
Original line number Diff line number Diff line
@@ -11,11 +11,12 @@ 
  pytest-check,

  pytest-mock,

  pytestCheckHook,

  writableTmpDirAsHomeHook,

}:



buildPythonPackage rec {

  pname = "craft-cli";

  version = "2.15.0";

  version = "3.0.0";



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

    repo = "craft-cli";

    tag = version;

    hash = "sha256-L8hOQJhjVAMo/WxEHHEk2QorlSdDFMGdcL/Q3Pv6mT4=";

    hash = "sha256-RAnvx5519iXZnJm8jtY635e0DEL7jnIgZtTCindqMTY=";

  };



  postPatch = ''
@@ -46,6 +47,7 @@ buildPythonPackage rec { 
    pytest-check

    pytest-mock

    pytestCheckHook

    writableTmpDirAsHomeHook

  ];



  pytestFlagsArray = [ "tests/unit" ];