Unverified Commit efccd13d authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #290205 from GaetanLepage/rye

rye: 0.24.0 -> 0.27.0
parents 9289da83 0e84747e
Loading
Loading
Loading
Loading
+61 −52
Original line number Diff line number Diff line
@@ -402,25 +402,6 @@ dependencies = [
 "cfg-if",
]

[[package]]
name = "crossbeam-deque"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
 "crossbeam-epoch",
 "crossbeam-utils",
]

[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
 "crossbeam-utils",
]

[[package]]
name = "crossbeam-utils"
version = "0.8.19"
@@ -810,6 +791,16 @@ dependencies = [
 "winapi",
]

[[package]]
name = "fslock"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
dependencies = [
 "libc",
 "winapi",
]

[[package]]
name = "generic-array"
version = "0.14.7"
@@ -1058,6 +1049,32 @@ dependencies = [
 "generic-array",
]

[[package]]
name = "insta"
version = "1.35.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2"
dependencies = [
 "console",
 "lazy_static",
 "linked-hash-map",
 "regex",
 "serde",
 "similar",
 "yaml-rust",
]

[[package]]
name = "insta-cmd"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1980f17994b79f75670aa90cfc8d35edc4aa248f16aa48b5e27835b080e452a2"
dependencies = [
 "insta",
 "serde",
 "serde_json",
]

[[package]]
name = "instant"
version = "0.1.12"
@@ -1152,6 +1169,12 @@ dependencies = [
 "serde_json",
]

[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

[[package]]
name = "linux-raw-sys"
version = "0.4.13"
@@ -1614,26 +1637,6 @@ dependencies = [
 "rand_core 0.5.1",
]

[[package]]
name = "rayon"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
dependencies = [
 "either",
 "rayon-core",
]

[[package]]
name = "rayon-core"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
 "crossbeam-deque",
 "crossbeam-utils",
]

[[package]]
name = "redox_syscall"
version = "0.4.1"
@@ -1792,7 +1795,7 @@ dependencies = [

[[package]]
name = "rye"
version = "0.24.0"
version = "0.27.0"
dependencies = [
 "age",
 "anyhow",
@@ -1806,11 +1809,14 @@ dependencies = [
 "decompress",
 "dialoguer",
 "flate2",
 "fslock",
 "git-testament",
 "globset",
 "hex",
 "home",
 "indicatif",
 "insta",
 "insta-cmd",
 "junction",
 "license",
 "memchr",
@@ -1837,7 +1843,6 @@ dependencies = [
 "toml_edit",
 "url",
 "walkdir",
 "whattheshell",
 "which",
 "winapi",
 "winreg",
@@ -2005,6 +2010,12 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

[[package]]
name = "similar"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"

[[package]]
name = "slug"
version = "0.1.5"
@@ -2101,7 +2112,6 @@ dependencies = [
 "libc",
 "ntapi",
 "once_cell",
 "rayon",
 "winapi",
]

@@ -2514,16 +2524,6 @@ version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"

[[package]]
name = "whattheshell"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c94d2698698cb1322e20292460fd158373af5fb2802afb6bea9ee17628efddb"
dependencies = [
 "sysinfo",
 "thiserror",
]

[[package]]
name = "which"
version = "6.0.0"
@@ -2741,6 +2741,15 @@ dependencies = [
 "rustix",
]

[[package]]
name = "yaml-rust"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
 "linked-hash-map",
]

[[package]]
name = "zerocopy"
version = "0.7.32"
+19 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@

rustPlatform.buildRustPackage rec {
  pname = "rye";
  version = "0.24.0";
  version = "0.27.0";

  src = fetchFromGitHub {
    owner = "mitsuhiko";
    repo = "rye";
    rev = "refs/tags/${version}";
    hash = "sha256-OiChd0qwgs3Wi4Xky27/99vBwaKNsq+4E+gpu5zwFqs=";
    hash = "sha256-tqwjhA81UYCtZjz6X5tIZ91pDVPe4UU+sTKUIzmOHlM=";
  };

  cargoLock = {
@@ -53,6 +53,23 @@ rustPlatform.buildRustPackage rec {

  checkFlags = [
    "--skip=utils::test_is_inside_git_work_tree"

    # The following require internet access to fetch a python binary
    "--skip=test_add_and_sync_no_auto_sync"
    "--skip=test_add_autosync"
    "--skip=test_add_flask"
    "--skip=test_add_from_find_links"
    "--skip=test_basic_tool_behavior"
    "--skip=test_config_empty"
    "--skip=test_config_get_set_multiple"
    "--skip=test_config_incompatible_format_and_show_path"
    "--skip=test_config_show_path"
    "--skip=test_empty_sync"
    "--skip=test_fetch"
    "--skip=test_init_default"
    "--skip=test_init_lib"
    "--skip=test_init_script"
    "--skip=test_lint_and_format"
  ];

  meta = with lib; {