From 5981da66693bc73e1246ba0c16eae97ca0413c45 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 4 Mar 2019 04:21:56 -0800
Subject: [PATCH] clightning: 0.6.3 -> 0.7.0 (#56788)

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/applications/altcoins/clightning.nix | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index 38b49fcb1c33..5f81dc76ecf2 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -1,37 +1,37 @@
 { stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
-  autogen, sqlite, gmp, zlib, fetchzip }:
+  autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "clightning-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
-  src = fetchzip {
-    #
-    # NOTE 0.6.3 release zip was bugged, this zip is a fix provided by the team
-    # https://github.com/ElementsProject/lightning/issues/2254#issuecomment-453791475
-    #
-    # replace url with:
-    #   https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip
-    # for future relases
-    #
-    url = "https://github.com/ElementsProject/lightning/files/2752675/clightning-v0.6.3.zip";
-    sha256 = "0k5pwimwn69pcakiq4a7qnjyf4i8w1jlacwrjazm1sfivr6nfiv6";
+  src = fetchurl {
+    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
+    sha256 = "448022c2433cbf19bbd0f726344b0500c0c21ee5cc2291edf6b622f094cb3a15";
   };
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which ];
+  nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ];
   buildInputs = [ sqlite gmp zlib python3 ];
 
   makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
 
+  patches = [
+    # remove after 0.7.0
+    (fetchpatch {
+      name = "fix-0.7.0-build.patch";
+      url = "https://github.com/ElementsProject/lightning/commit/ffc03d2bc84dc42f745959fbb6c8007cf0a6f701.patch";
+      sha256 = "1m5fiz3m8k3nk09nldii8ij94bg6fqllqgdbiwj3sy12vihs8c4v";
+    })
+  ];
+
   configurePhase = ''
     ./configure --prefix=$out --disable-developer --disable-valgrind
   '';
 
   postPatch = ''
-    echo "" > tools/refresh-submodules.sh
     patchShebangs tools/generate-wire.py
   '';