meguca: 2018-06-11 -> 2018-06-21

2 files changed, 25 insertions, 19 deletions

diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index c6d97b17fb9..206b279a7f1 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -1,23 +1,29 @@
-{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate,
-  go-bindata, easyjson, nodePackages, cmake, emscripten }:
+{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick
+, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake
+, emscripten }:
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-06-11";
-  rev = "0c10e89fade68da414a574b5b0fa2f0dba432ea8";
+  version = "2018-06-21";
+  rev = "a60b75afd10ca99ce05a362ffeb586a1ece3d41d";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ];
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bakape/meguca";
-    sha256 = "1nw0hfa0ikbk8d5rsj3fbdwhzwnxjqkw8ypswd0hyw8nwsaxyyq8";
+    sha256 = "0dh168j4lfn7rk64difdq3mxcp82j8h799pvpkz40h4sw2l81qc9";
     fetchSubmodules = true;
   };
 
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  buildInputs = [
+    ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson
+    emscripten 
+  ];
+
   buildPhase = ''
     export HOME=$PWD
     export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go
@@ -38,7 +44,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bakape/meguca";
-    description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation";
+    description = "High performance anonymous realtime imageboard";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ chiiruno ];
     platforms = platforms.all;
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index d6785061ba3..af4ea727acd 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Masterminds/squirrel";
-      rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df";
-      sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp";
+      rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a";
+      sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg";
     };
   }
   {
@@ -50,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bakape/thumbnailer";
-      rev = "bb51d30d3f3379cd17f4f2a43d1a7caf0d92b497";
-      sha256 = "0rgyfi14v17acz56hm9j0dzk0kx8k6jfjcwjzvr7b04bahw09zc4";
+      rev = "cd096c6823fae426b69921662bcfaf142e395d05";
+      sha256 = "1xd1g36s3a0ynaxg4gf49r40ri9y154dlkd40dcpkhj6q294s02k";
     };
   }
   {
@@ -230,8 +230,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9";
-      sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1";
+      rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+      sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
     };
   }
   {
@@ -239,8 +239,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c1e4f34a39c8bf93b6a3379e4ffb3b118ecc614";
-      sha256 = "1jcf4xhbw9zxzhx4w3z9i0bsgb8n59sfrs628a2xsd805b8zlw0r";
+      rev = "ad87a3a340fa7f3bed189293fbfa7a9b7e021ae1";
+      sha256 = "0d38dpn3cl3h0ksxdnkwk2z3rsjwihqzd4ggwrnwmj405zgv1ar9";
     };
   }
   {
@@ -248,8 +248,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
-      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
+      rev = "5cec4b58c438bd98288aeb248bab2c1840713d21";
+      sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds";
     };
   }
   {