diff options
author | Okina Matara <okinan@chiru.no> | 2018-06-09 22:49:27 -0500 |
---|---|---|
committer | Okina Matara <okinan@chiru.no> | 2018-06-29 15:56:33 -0500 |
commit | 4b91c2428b6547d98f44abe395f997209ebd5a00 (patch) | |
tree | eae9ccb3e75d5f5abd00a78124d7efe17b49f2b8 /pkgs/servers/meguca | |
parent | 05474564b29e8fea5acff814dd841359e537fcba (diff) | |
download | nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.gz nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.bz2 nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.lz nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.xz nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.tar.zst nixpkgs-4b91c2428b6547d98f44abe395f997209ebd5a00.zip |
meguca: 2018-05-26 -> 2018-06-10
Diffstat (limited to 'pkgs/servers/meguca')
-rw-r--r-- | pkgs/servers/meguca/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/meguca/server_deps.nix | 33 |
2 files changed, 27 insertions, 20 deletions
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index bfe21543555..05666074181 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,8 +3,8 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-05-26"; - rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e"; + version = "2018-06-10"; + rev = "e2f97faf10fd3dd672f9b80d220079bfad1c045c"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; enableParallelBuilding = true; @@ -14,20 +14,18 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq"; + sha256 = "1blj970kdvasgxxwca6idvzl6ha29g9fvqwxgy00j7hk37hzkkzf"; fetchSubmodules = true; }; - configurePhase = '' + buildPhase = '' export HOME=$PWD - export GOPATH=$GOPATH:$HOME/go + export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go + cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - ''; - - buildPhase = '' go build -p $NIX_BUILD_CORES meguca make -j $NIX_BUILD_CORES client wasm ''; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 493297b9757..d6785061ba3 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -1,6 +1,15 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { + goPackagePath = "github.com/ErikDubbelboer/gspt"; + fetch = { + type = "git"; + url = "https://github.com/ErikDubbelboer/gspt"; + rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; + sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + }; + } + { goPackagePath = "github.com/Masterminds/squirrel"; fetch = { type = "git"; @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f"; - sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x"; + rev = "bb51d30d3f3379cd17f4f2a43d1a7caf0d92b497"; + sha256 = "0rgyfi14v17acz56hm9j0dzk0kx8k6jfjcwjzvr7b04bahw09zc4"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; } { @@ -185,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa"; - sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4"; + rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; + sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; }; } { @@ -221,8 +230,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a3beeb748656e13e54256fd2cde19e058f41f60f"; - sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki"; + rev = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"; + sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1"; }; } { @@ -230,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f"; - sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189"; + rev = "7c1e4f34a39c8bf93b6a3379e4ffb3b118ecc614"; + sha256 = "1jcf4xhbw9zxzhx4w3z9i0bsgb8n59sfrs628a2xsd805b8zlw0r"; }; } { |