From a7dfe3f9cd7ee6d49ea80e9953d62fb7b6b10cba Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 5 Sep 2019 21:59:09 +0100 Subject: [PATCH] perkeep: 0.10.1 -> unstable-2019-07-29 0.10.1 is the latest release but it doesn't build with recent go versions --- pkgs/applications/misc/perkeep/default.nix | 31 +++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 8804e438b7e8af..ae81ef3c9f6c21 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,18 +1,37 @@ -{ buildGo110Package, fetchzip, lib }: +{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: -buildGo110Package rec { +let + gouiJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; + sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + }; + + publisherJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; + sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + }; + +in buildGoPackage rec { name = "perkeep-${version}"; - version = "0.10.1"; + version = "unstable-2019-07-29"; - src = fetchzip { - url = "https://perkeep.org/dl/perkeep-${version}-src.zip"; - sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422"; + src = fetchFromGitHub { + owner = "perkeep"; + repo = "perkeep"; + rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; + sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; }; goPackagePath = "perkeep.org"; buildPhase = '' cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + + # Skip network fetches + sed -i '/fetchAllJS/a if true { return nil }' make.go + cp ${publisherJS} app/publisher/publisher.js + cp ${gouiJS} server/perkeepd/ui/goui.js + go run make.go '';