From 054d01e37396e12df2025e94fb14f8b7c546657b Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Wed, 13 Sep 2023 16:39:32 -0600 Subject: [PATCH 1/4] chore(release): v0.4.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd56c58..79b0b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed ### Removed +## 2023-09-13: v0.4.2 +### Changed +- Upgrade to Holochain v0.2.2. + ## 2023-09-11: v0.4.2-rc.3 ### Changed - Upgrade to Holochain v0.2.2-beta-rc.3. From c1ea33952e360a1f5e0947e2ee29c3d7d32d29b2 Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Thu, 28 Sep 2023 19:31:39 -0600 Subject: [PATCH 2/4] build(nix): upgrade holochain to 0.2.2 --- flake.lock | 51 +++++++++++++++++++++++++++++++-------------------- flake.nix | 4 ++-- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index c567a4d..26988e6 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "crate2nix": { "flake": false, "locked": { - "lastModified": 1675642992, - "narHash": "sha256-uDBDZuiq7qyg82Udp82/r4zg5HKfIzBQqgl2U9THiQM=", + "lastModified": 1693149153, + "narHash": "sha256-HUszQcnIal1FFRAWraODDbxTp0HECwczRTD+Zf0v9o0=", "owner": "kolloch", "repo": "crate2nix", - "rev": "45fc83132c8c91c77a1cd61fe0c945411d1edba8", + "rev": "8749f46953b46d44fd181b002399e4a20371f323", "type": "github" }, "original": { @@ -213,6 +213,7 @@ "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "repo-git": "repo-git", "rust-overlay": "rust-overlay_2", "scaffolding": [ "holonix", @@ -223,16 +224,15 @@ ] }, "locked": { - "lastModified": 1694635297, - "narHash": "sha256-nFUouAxuTr+qgLlTP+tPFV1OnwHoaPgfmBuCKUsIvTE=", + "lastModified": 1695928743, + "narHash": "sha256-VmeQsuu6AWG7tDnrmLal+iaz/E0IO608/v1n1noE+Zo=", "owner": "holochain", "repo": "holochain", - "rev": "b1a03c2c455948ec86b1c50f7f66344ca32255df", + "rev": "e7dece152120fc34448177c239564c8c0af8528e", "type": "github" }, "original": { "owner": "holochain", - "ref": "nix/fix-and-pin-lair-0.3.0-input", "repo": "holochain", "type": "github" } @@ -288,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { @@ -335,6 +335,18 @@ "type": "github" } }, + "repo-git": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:/dev/null" + }, + "original": { + "type": "file", + "url": "file:/dev/null" + } + }, "root": { "inputs": { "holonix": "holonix", @@ -381,11 +393,11 @@ ] }, "locked": { - "lastModified": 1689647697, - "narHash": "sha256-8ZX/DVpKLmr85FRKILb+2p+JuxfLQ49LjXG/gmwsoIU=", + "lastModified": 1695867081, + "narHash": "sha256-TP1ocrZSKvfGgpdjw7bUd+jEuF1/OBfuKHvK5EEAhww=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed2774a9131ddad12e552ba04bd92f87df04a28b", + "rev": "9d8f850c3de67597c65271f3088aced0a671677f", "type": "github" }, "original": { @@ -397,11 +409,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1683890859, - "narHash": "sha256-/nG2TGU4Q7zy0KGS/opcW1836LZ7FJhA+/OEh5gNj34=", + "lastModified": 1695674679, + "narHash": "sha256-IwgQbgitUo61ZXYSXBAro5ThfYy/yMGmzZGTb3c6sT0=", "owner": "holochain", "repo": "scaffolding", - "rev": "1ca1092ad5d147bd23a75444874830cc033aa9cf", + "rev": "821439b8dd49d5ce594be04c4720df25e88a4dbc", "type": "github" }, "original": { @@ -435,17 +447,16 @@ }, "locked": { "dir": "versions/0_2", - "lastModified": 1694635297, - "narHash": "sha256-nFUouAxuTr+qgLlTP+tPFV1OnwHoaPgfmBuCKUsIvTE=", + "lastModified": 1695928743, + "narHash": "sha256-VmeQsuu6AWG7tDnrmLal+iaz/E0IO608/v1n1noE+Zo=", "owner": "holochain", "repo": "holochain", - "rev": "b1a03c2c455948ec86b1c50f7f66344ca32255df", + "rev": "e7dece152120fc34448177c239564c8c0af8528e", "type": "github" }, "original": { "dir": "versions/0_2", "owner": "holochain", - "ref": "nix/fix-and-pin-lair-0.3.0-input", "repo": "holochain", "type": "github" } diff --git a/flake.nix b/flake.nix index 2e64ff6..bd3890f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { nixpkgs.follows = "holonix/nixpkgs"; - versions.url = "github:holochain/holochain/nix/fix-and-pin-lair-0.3.0-input?dir=versions/0_2"; - holonix.url = "github:holochain/holochain/nix/fix-and-pin-lair-0.3.0-input"; + versions.url = "github:holochain/holochain?dir=versions/0_2"; + holonix.url = "github:holochain/holochain"; holonix.inputs.versions.follows = "versions"; }; From 890897f84418050b74c84abe1ad032fb3f56bed4 Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Thu, 28 Sep 2023 19:40:06 -0600 Subject: [PATCH 3/4] build(serde): pin to v1.0.166 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 63c5867..486ce21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ holochain_serialized_bytes = "0.0.52" holochain_types = "0.2.2" holochain_websocket = "0.2.2" holochain_zome_types = { workspace = true } -serde = "1" +serde = "1.0.166" url = "2.2" [dev-dependencies] From eb1f65e3cab0a6f422fffb012c11a3094bdad76e Mon Sep 17 00:00:00 2001 From: Jost Schulte Date: Thu, 28 Sep 2023 19:41:39 -0600 Subject: [PATCH 4/4] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79b0b2b..e47a3a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added ### Changed +- Pin serde to v1.0.166 ### Fixed ### Removed