diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/hugo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/perkeep/default.nix | 31 |
2 files changed, 28 insertions, 9 deletions
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 034b9c79201a..720445be9bea 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.57.2"; + version = "0.58.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8"; + sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d"; }; - modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1"; + modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 8804e438b7e8..ae81ef3c9f6c 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 ''; |