Skip to content

Commit 4bda8fe

Browse files
committed
Keep cardano-wallet’s 3382.patch inside our repository
1 parent 137d18b commit 4bda8fe

File tree

2 files changed

+69
-2
lines changed

2 files changed

+69
-2
lines changed

default.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ let
3737
chmod -R +w $out
3838
cd $out
3939
patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
40-
patch -p1 -i ${pkgs.fetchurl {
41-
url = "https://github.com/input-output-hk/cardano-wallet/pull/3382.patch";
40+
patch -p1 -i ${builtins.path {
41+
# XXX: unfortunately, GitHub changed lengths of hashes in patches it returns for PRs,
42+
# that’s why we’re providing this patch inside our repo, with the same exact SHA-256,
43+
# to the one released in 4.12.0:
44+
path = ./nix/cardano-wallet--pr-3382--ledger-bug.patch;
45+
recursive = false;
4246
sha256 = "1ii12g2zikv4197c7bsh4v5dc1jzygn1jap8xvnr7mvh3a09pdgn";
4347
}}
4448
'';
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
From 3f0186bdc9231b0bc3523294d4b6ead52b0e1419 Mon Sep 17 00:00:00 2001
2+
From: Samuel Evans-Powell <[email protected]>
3+
Date: Mon, 11 Jul 2022 10:14:31 +0800
4+
Subject: [PATCH 1/2] Bump to cardano-node 1.35.1
5+
6+
---
7+
cabal.project | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/cabal.project b/cabal.project
11+
index 40f1ec8899..9eb3a27fd4 100644
12+
--- a/cabal.project
13+
+++ b/cabal.project
14+
@@ -213,8 +213,8 @@ source-repository-package
15+
source-repository-package
16+
type: git
17+
location: https://github.com/input-output-hk/cardano-node
18+
- tag: 9f1d7dc163ee66410d912e48509d6a2300cfa68a
19+
- --sha256: 06arx9hv7dn3qxfy83f0b6018rxbsvh841nvfyg5w6qclm1hddj7
20+
+ tag: c75451f0ffd7a60b5ad6c4263891e6c8acac105a
21+
+ --sha256: 1z0zv1i58ikmbqg878f9z573jkwp4lzhmmswshm6c96rq6lprzh8
22+
subdir:
23+
cardano-api
24+
cardano-git-rev
25+
26+
From a4d31a3e3d4dbd3b713dff5d911edd3869a3b343 Mon Sep 17 00:00:00 2001
27+
From: Samuel Evans-Powell <[email protected]>
28+
Date: Mon, 11 Jul 2022 10:21:02 +0800
29+
Subject: [PATCH 2/2] Bump version of cardano-node in compatibility matrix
30+
31+
---
32+
README.md | 2 +-
33+
cabal.project | 4 ++--
34+
2 files changed, 3 insertions(+), 3 deletions(-)
35+
36+
diff --git a/README.md b/README.md
37+
index d10239eec3..b0c8c7ceec 100644
38+
--- a/README.md
39+
+++ b/README.md
40+
@@ -73,7 +73,7 @@ See **Installation Instructions** for each available [release](https://github.co
41+
>
42+
> | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions)
43+
> | --- | --- | ---
44+
-> | `master` branch | [1.35.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.0) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
45+
+> | `master` branch | [1.35.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
46+
> | [v2022-07-01](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-07-01) | [1.35.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.0) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
47+
> | [v2022-05-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-05-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
48+
> | [v2022-04-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-04-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
49+
diff --git a/cabal.project b/cabal.project
50+
index 9eb3a27fd4..c83a3e282c 100644
51+
--- a/cabal.project
52+
+++ b/cabal.project
53+
@@ -183,8 +183,8 @@ source-repository-package
54+
source-repository-package
55+
type: git
56+
location: https://github.com/input-output-hk/cardano-ledger
57+
- tag: ce3057e0863304ccb3f79d78c77136219dc786c6
58+
- --sha256: 19ijcy1sl1iqa7diy5nsydnjsn3281kp75i2i42qv0fpn58238s9
59+
+ tag: 3be8a19083fc13d9261b1640e27dd389b51bb08e
60+
+ --sha256: 0dvm9l43mp1i34bcywmznd0660hhcfxwgawypk9q1hjkml1i41z3
61+
subdir:
62+
eras/alonzo/impl
63+
eras/alonzo/test-suite

0 commit comments

Comments
 (0)