Browse Source

patch to avoid quote version which was pulled from crates.io

Mokhtar Naamani 5 years ago
parent
commit
a7d1bbbd2b
3 changed files with 60 additions and 56 deletions
  1. 47 47
      Cargo.lock
  2. 12 8
      Cargo.toml
  3. 1 1
      src/lib.rs

+ 47 - 47
Cargo.lock

@@ -100,7 +100,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
 dependencies = [
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -589,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "failure"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
 dependencies = [
  "backtrace",
  "failure_derive",
@@ -599,12 +599,12 @@ dependencies = [
 
 [[package]]
 name = "failure_derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
  "synstructure",
 ]
@@ -1004,7 +1004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -1037,7 +1037,7 @@ checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
 [[package]]
 name = "joystream-node-runtime"
-version = "6.5.0"
+version = "6.6.0"
 dependencies = [
  "parity-scale-codec",
  "safe-mix",
@@ -1886,7 +1886,7 @@ checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -2007,7 +2007,7 @@ checksum = "6d4dc4a7f6f743211c5aab239640a65091535d97d43d92a52bca435a640892bb"
 dependencies = [
  "proc-macro-hack 0.5.11",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -2082,7 +2082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -2133,9 +2133,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 dependencies = [
  "proc-macro2 1.0.9",
 ]
@@ -2494,7 +2494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -2664,7 +2664,7 @@ dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -2983,7 +2983,7 @@ source = "git+https://github.com/paritytech/substrate.git?rev=c37bb08535c49a1232
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -3028,7 +3028,7 @@ version = "2.0.0"
 source = "git+https://github.com/paritytech/substrate.git?rev=c37bb08535c49a12320af7facfd555ce05cce2e8#c37bb08535c49a12320af7facfd555ce05cce2e8"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "sr-api-macros",
  "srml-support-procedural-tools",
  "syn 1.0.16",
@@ -3041,7 +3041,7 @@ source = "git+https://github.com/paritytech/substrate.git?rev=c37bb08535c49a1232
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "srml-support-procedural-tools-derive",
  "syn 1.0.16",
 ]
@@ -3052,7 +3052,7 @@ version = "2.0.0"
 source = "git+https://github.com/paritytech/substrate.git?rev=c37bb08535c49a12320af7facfd555ce05cce2e8#c37bb08535c49a12320af7facfd555ce05cce2e8"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -3277,7 +3277,7 @@ version = "2.0.0"
 source = "git+https://github.com/paritytech/substrate.git?rev=c37bb08535c49a12320af7facfd555ce05cce2e8#c37bb08535c49a12320af7facfd555ce05cce2e8"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
 ]
 
@@ -3331,12 +3331,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-forum-module"
-version = "1.1.0"
-source = "git+https://github.com/joystream/substrate-forum-module?tag=v1.1.0#3e405b0aed239b15a866897402b9df225bc0636a"
+version = "1.1.1"
+source = "git+https://github.com/joystream/substrate-forum-module?tag=v1.1.1#5918fc90d25faeac06311b0d6b05305cbe722a27"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3361,12 +3361,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-hiring-module"
-version = "1.0.0"
-source = "git+https://github.com/Joystream/substrate-hiring-module?tag=v1.0.0#4929b8be1a3e1c0f48be4a666f70a3c145085b29"
+version = "1.0.1"
+source = "git+https://github.com/Joystream/substrate-hiring-module?tag=v1.0.1#e387af033fb0e81c66d487bdec445153b0fe3cdf"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3482,12 +3482,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-recurring-reward-module"
-version = "1.0.0"
-source = "git+https://github.com/Joystream/substrate-recurring-reward-module?tag=v1.0.0#cf945e1f4df333555aaef1f95c14e7950bd55ba7"
+version = "1.0.1"
+source = "git+https://github.com/Joystream/substrate-recurring-reward-module?tag=v1.0.1#2c4bda1dea315629313643737c2f59979579fb50"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3523,12 +3523,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-stake-module"
-version = "1.0.0"
-source = "git+https://github.com/Joystream/substrate-stake-module/?tag=v1.0.0#e8241cf7b42bdd89352f39420b17294cae349679"
+version = "1.0.1"
+source = "git+https://github.com/Joystream/substrate-stake-module/?tag=v1.0.1#af5860c3cde5b11e37728df0b1dfbbdf9a9fa2f3"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3584,12 +3584,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-token-mint-module"
-version = "1.0.0"
-source = "git+https://github.com/joystream/substrate-token-minting-module/?tag=v1.0.0#af6da475886cedf0d3f3c9325dd32b22a30b9662"
+version = "1.0.1"
+source = "git+https://github.com/joystream/substrate-token-minting-module/?tag=v1.0.1#7905ce50136cf8483a808a1946fbf123b9ca4bb8"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3618,12 +3618,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-versioned-store"
-version = "1.1.0"
-source = "git+https://github.com/joystream/substrate-versioned-store-module?tag=v1.0.0#feadff11b6b30b7ca065d9a5077fa3749142566d"
+version = "1.0.1"
+source = "git+https://github.com/joystream/substrate-versioned-store-module?tag=v1.0.1#24bcd60e84c1ece74a8a3130beb740f6fa760145"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3638,12 +3638,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-versioned-store-permissions-module"
-version = "1.0.0"
-source = "git+https://github.com/joystream/substrate-versioned-store-permissions-module?tag=v1.0.0#983c0e53b587a153d4611032f665911299d3e17c"
+version = "1.0.1"
+source = "git+https://github.com/joystream/substrate-versioned-store-permissions-module?tag=v1.0.1#dd75f4bfe283673685c4ccf9de14384a546daa6e"
 dependencies = [
  "hex-literal 0.1.4",
  "parity-scale-codec",
- "quote 1.0.2",
+ "quote 0.6.13",
  "serde",
  "serde_derive",
  "sr-io",
@@ -3700,7 +3700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "unicode-xid 0.2.0",
 ]
 
@@ -3711,7 +3711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
  "unicode-xid 0.2.0",
 ]
@@ -4159,7 +4159,7 @@ dependencies = [
  "lazy_static",
  "log",
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
  "wasm-bindgen-shared",
 ]
@@ -4183,7 +4183,7 @@ version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
 dependencies = [
- "quote 1.0.2",
+ "quote 1.0.3",
  "wasm-bindgen-macro-support",
 ]
 
@@ -4194,7 +4194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -4372,7 +4372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
  "proc-macro2 1.0.9",
- "quote 1.0.2",
+ "quote 1.0.3",
  "syn 1.0.16",
  "synstructure",
 ]

+ 12 - 8
Cargo.toml

@@ -4,7 +4,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '6.5.0'
+version = '6.6.0'
 
 [features]
 default = ['std']
@@ -52,6 +52,10 @@ std = [
     'versioned_store_permissions/std'
 ]
 
+# [dependencies]
+# # https://users.rust-lang.org/t/failure-derive-compilation-error/39062
+# quote = '<=1.0.2'
+
 [dependencies.babe]
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
@@ -262,40 +266,40 @@ version = '1.0.4'
 default_features = false
 package = 'substrate-forum-module'
 git = 'https://github.com/joystream/substrate-forum-module'
-tag = 'v1.1.0'
+tag = 'v1.1.1'
 
 [dependencies.minting]
 default_features = false
 package = 'substrate-token-mint-module'
 git = 'https://github.com/joystream/substrate-token-minting-module/'
-tag = 'v1.0.0'
+tag = 'v1.0.1'
 
 [dependencies.stake]
 default_features = false
 package = 'substrate-stake-module'
 git = 'https://github.com/Joystream/substrate-stake-module/'
-tag = 'v1.0.0'
+tag = 'v1.0.1'
 
 [dependencies.recurringrewards]
 default_features = false
 package = 'substrate-recurring-reward-module'
 git = 'https://github.com/Joystream/substrate-recurring-reward-module'
-tag = 'v1.0.0'
+tag = 'v1.0.1'
 
 [dependencies.hiring]
 default_features = false
 package = 'substrate-hiring-module'
 git = 'https://github.com/Joystream/substrate-hiring-module'
-tag = 'v1.0.0'
+tag = 'v1.0.1'
 
 [dependencies.versioned_store]
 default_features = false
 package ='substrate-versioned-store'
 git = 'https://github.com/joystream/substrate-versioned-store-module'
-tag = 'v1.0.0'
+tag = 'v1.0.1'
 
 [dependencies.versioned_store_permissions]
 default_features = false
 package = 'substrate-versioned-store-permissions-module'
 git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
-tag = 'v1.0.0'
+tag = 'v1.0.1'

+ 1 - 1
src/lib.rs

@@ -115,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 6,
-    spec_version: 5,
+    spec_version: 6,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
 };