diff options
| author | Okina Matara <okinan@chiru.no> | 2018-06-27 01:31:23 -0500 |
|---|---|---|
| committer | Okina Matara <okinan@chiru.no> | 2018-06-29 15:57:13 -0500 |
| commit | cd667e43aee7a3c08717258f15a6afe0fff108a4 (patch) | |
| tree | 4fb8b44039a0714b522a103ee3024f6c6192bc83 /pkgs/servers | |
| parent | f80c01b3f47d92cd6f49ee88867e281892f61420 (diff) | |
| download | nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar.gz nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar.bz2 nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar.lz nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar.xz nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.tar.zst nixpkgs-cd667e43aee7a3c08717258f15a6afe0fff108a4.zip | |
meguca: 2018-06-23 -> 2018-06-27
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/meguca/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/meguca/server_deps.nix | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 9373ebdb5d3..e1d76d9b1a4 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick -, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake -, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, libcxx, libcxxabi +, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson +, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-23"; - rev = "5a156e1c2a972c6d799a667f3a1a189355ea8655"; + version = "2018-06-27"; + rev = "4780ed4c51475e5e0382fe70ff8ab2187fbbf447"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1asa5vccgl6f9c01nddpjjkw54yammbsj3wg80sbpmq9nc0djdjj"; + sha256 = "1yc22qv5rrawlc3923a8zmhz21b00pidk1ij4fxmm9a001cm3fi3"; fetchSubmodules = true; }; @@ -21,8 +21,8 @@ buildGoPackage rec { buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson - emscripten - ]; + emscripten + ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxx libcxxabi ]; buildPhase = '' export HOME=$PWD diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index c7b92c15231..137f355ce72 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "cca71d50e2f2a18f255652068be06977740fd2d5"; - sha256 = "07mwy19z8jk0v9dvsvkr48hhhiigclban6gr5fap8531hj9m5mqc"; + rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; + sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "63fc586f45fe72d95d5240a5d5eb95e6503907d3"; - sha256 = "1272649cna3w2mw64qld6m1w4l5zm4jy00nhpcii03pxj3m2dqlr"; + rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; + sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; }; } { |