From dc7e117652fe9799c03b4ed0f3f7882024765e22 Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Fri, 21 Dec 2018 10:12:17 +0100 Subject: [PATCH 1/3] Bump cardano-crypto Fixes deriveXPub: bip32 hd wallet public key derivation https://github.com/input-output-hk/cardano-crypto/pull/52 --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 209c9f5d67b..d4cb2f4a60e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -52,7 +52,7 @@ packages: - location: git: https://github.com/input-output-hk/cardano-crypto - commit: 3c707936ba0a665375acf5bd240dc4b6eaa6c0bc + commit: 59eb60b3a227c615736db9bb1609fd5c20109098 extra-dep: true # to be removed when haskell-ip is in the current stackage version - location: From c089093b2113525e483c3f2fe21396c2b2facd93 Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Fri, 21 Dec 2018 15:25:13 +0100 Subject: [PATCH 2/3] Fix default nix --- nix/.stack.nix/cardano-crypto.nix | 4 ++-- pkgs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/.stack.nix/cardano-crypto.nix b/nix/.stack.nix/cardano-crypto.nix index 5f3cd51c2a6..66da224ae07 100644 --- a/nix/.stack.nix/cardano-crypto.nix +++ b/nix/.stack.nix/cardano-crypto.nix @@ -94,7 +94,7 @@ } // { src = pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-crypto"; - rev = "3c707936ba0a665375acf5bd240dc4b6eaa6c0bc"; - sha256 = "0g8ln8k8wx4csdv92bz09pr7v9dp4lcyv1334b09c9rgwdwhqg1b"; + rev = "59eb60b3a227c615736db9bb1609fd5c20109098"; + sha256 = "0afacdk9ibdzay43l79r1zvg957gkrnrfla5dzcd64jz6xnigg8j"; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 6bf60a5407f..53c5a585c40 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13340,8 +13340,8 @@ version = "1.1.0"; src = fetchgit { url = "https://github.com/input-output-hk/cardano-crypto"; -sha256 = "0g8ln8k8wx4csdv92bz09pr7v9dp4lcyv1334b09c9rgwdwhqg1b"; -rev = "3c707936ba0a665375acf5bd240dc4b6eaa6c0bc"; +sha256 = "0afacdk9ibdzay43l79r1zvg957gkrnrfla5dzcd64jz6xnigg8j"; +rev = "59eb60b3a227c615736db9bb1609fd5c20109098"; fetchSubmodules = true; }; From d234b853600702118d5fb6e1879f648caab40a7f Mon Sep 17 00:00:00 2001 From: Ante Kegalj Date: Fri, 21 Dec 2018 16:13:11 +0100 Subject: [PATCH 3/3] Apply nix patch (v2) --- .stack-to-nix.cache | 1 + 1 file changed, 1 insertion(+) diff --git a/.stack-to-nix.cache b/.stack-to-nix.cache index 5f64acadd19..7a7767aadea 100644 --- a/.stack-to-nix.cache +++ b/.stack-to-nix.cache @@ -24,3 +24,4 @@ https://github.com/primetype/inspector.git 964558881210bf1f9387b51ab05057b1290d1 https://github.com/input-output-hk/cardano-crypto 3c707936ba0a665375acf5bd240dc4b6eaa6c0bc . 0g8ln8k8wx4csdv92bz09pr7v9dp4lcyv1334b09c9rgwdwhqg1b cardano-crypto .stack.nix/cardano-crypto.nix https://github.com/angerman/inspector.git 9215d64b8a05d366d31135b89644823ecdc3efb8 . 12q1v7a8kcw7qi4lws4j3mvxwfkhni6zmp870kmnkgbgwvrax9gs inspector .stack.nix/inspector.nix https://github.com/primetype/inspector.git c975f4329365f0379c04358138e616fb96fb0b79 . 12q1v7a8kcw7qi4lws4j3mvxwfkhni6zmp870kmnkgbgwvrax9gs inspector .stack.nix/inspector.nix +https://github.com/input-output-hk/cardano-crypto 59eb60b3a227c615736db9bb1609fd5c20109098 . 0afacdk9ibdzay43l79r1zvg957gkrnrfla5dzcd64jz6xnigg8j cardano-crypto .stack.nix/cardano-crypto.nix