public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51629 from Chiiruno/dev/update

Browse Source 
Update: quicktemplate, nodePackages: meguca, meguca, hydron
This commit is contained in:
Jörg Thalheim 2018-12-08 16:25:00 +00:00 committed by GitHub
commit d4aa3cce93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2365 additions and 2226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4276
pkgs/development/node-packages/node-packages-v10.nix
View File

File diff suppressed because it is too large Load Diff

36
pkgs/development/node-packages/node-packages-v6.nix
View File

@ -13,13 +13,13 @@ let
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
}; };
}; };
"ajv-6.5.5" = { "ajv-6.6.1" = {
name = "ajv"; name = "ajv";
packageName = "ajv"; packageName = "ajv";
version = "6.5.5"; version = "6.6.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz"; url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
}; };
}; };
"ansi-regex-2.1.1" = { "ansi-regex-2.1.1" = {
@ -1854,7 +1854,7 @@ let
packageName = "string_decoder"; packageName = "string_decoder";
version = "1.1.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
}; };
}; };
@ -2065,13 +2065,13 @@ let
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
}; };
}; };
"yallist-3.0.2" = { "yallist-3.0.3" = {
name = "yallist"; name = "yallist";
packageName = "yallist"; packageName = "yallist";
version = "3.0.2"; version = "3.0.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
}; };
}; };
}; };
@ -2082,7 +2082,7 @@ in
packageName = "bower"; packageName = "bower";
version = "1.8.4"; version = "1.8.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
@ -2391,7 +2391,7 @@ in
}; };
dependencies = [ dependencies = [
sources."abbrev-1.1.1" sources."abbrev-1.1.1"
sources."ajv-6.5.5" sources."ajv-6.6.1"
sources."ansi-regex-2.1.1" sources."ansi-regex-2.1.1"
sources."aproba-1.2.0" sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5" sources."are-we-there-yet-1.1.5"
@ -2502,10 +2502,10 @@ in
node-gyp-build = nodeEnv.buildNodePackage { node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build"; name = "node-gyp-build";
packageName = "node-gyp-build"; packageName = "node-gyp-build";
version = "3.5.0"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -2592,7 +2592,7 @@ in
sources."util-deprecate-1.0.2" sources."util-deprecate-1.0.2"
sources."wide-align-1.1.3" sources."wide-align-1.1.3"
sources."wrappy-1.0.2" sources."wrappy-1.0.2"
sources."yallist-3.0.2" sources."yallist-3.0.3"
]; ];
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -2606,10 +2606,10 @@ in
pnpm = nodeEnv.buildNodePackage { pnpm = nodeEnv.buildNodePackage {
name = "pnpm"; name = "pnpm";
packageName = "pnpm"; packageName = "pnpm";
version = "2.18.2"; version = "2.20.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.18.2.tgz"; url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
sha512 = "yJu5pCPFmzxD9xQtWay4nI7JdcrpIIom/VwwMmUvU6itN0wAbbyIaGKz57JCu1E+ZfbOvcaOzEmifbypHfFNXw=="; sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {

68
pkgs/development/node-packages/node-packages-v8.nix
View File

@ -40,13 +40,13 @@ let
sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
}; };
}; };
"ajv-6.5.5" = { "ajv-6.6.1" = {
name = "ajv"; name = "ajv";
packageName = "ajv"; packageName = "ajv";
version = "6.5.5"; version = "6.6.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz"; url = "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz";
sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; sha512 = "ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==";
}; };
}; };
"ansi-regex-2.1.1" = { "ansi-regex-2.1.1" = {
@ -589,13 +589,13 @@ let
sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
}; };
}; };
"core-js-2.5.7" = { "core-js-2.6.0" = {
name = "core-js"; name = "core-js";
packageName = "core-js"; packageName = "core-js";
version = "2.5.7"; version = "2.6.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz"; url = "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz";
sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; sha512 = "kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==";
}; };
}; };
"core-util-is-1.0.2" = { "core-util-is-1.0.2" = {
@ -2664,7 +2664,7 @@ let
packageName = "string_decoder"; packageName = "string_decoder";
version = "1.1.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; url = "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
}; };
}; };
@ -2772,7 +2772,7 @@ let
packageName = "tough-cookie"; packageName = "tough-cookie";
version = "2.3.4"; version = "2.3.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
}; };
}; };
@ -2835,7 +2835,7 @@ let
packageName = "underscore"; packageName = "underscore";
version = "1.6.0"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
}; };
}; };
@ -2929,13 +2929,13 @@ let
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
}; };
}; };
"walk-sync-0.3.3" = { "walk-sync-0.3.4" = {
name = "walk-sync"; name = "walk-sync";
packageName = "walk-sync"; packageName = "walk-sync";
version = "0.3.3"; version = "0.3.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.3.tgz"; url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz";
sha512 = "jQgTHmCazUngGqvHZFlr30u2VLKEKErBMLFe+fBl5mn4rh9aI/QVRog8PT1hv2vaOu4EBwigfmpRTyZrbnpRVA=="; sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==";
}; };
}; };
"which-1.3.1" = { "which-1.3.1" = {
@ -3010,13 +3010,13 @@ let
sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
}; };
}; };
"yallist-3.0.2" = { "yallist-3.0.3" = {
name = "yallist"; name = "yallist";
packageName = "yallist"; packageName = "yallist";
version = "3.0.2"; version = "3.0.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
}; };
}; };
}; };
@ -3025,10 +3025,10 @@ in
alloy = nodeEnv.buildNodePackage { alloy = nodeEnv.buildNodePackage {
name = "alloy"; name = "alloy";
packageName = "alloy"; packageName = "alloy";
version = "1.13.4"; version = "1.13.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/alloy/-/alloy-1.13.4.tgz"; url = "https://registry.npmjs.org/alloy/-/alloy-1.13.5.tgz";
sha512 = "EjH9edCzDZzUFj5Cko6Za/nd9pQsxwL/kza+EI8sfH0UFA8YYuFBriOITnE/T9E4bJC3kEJEakGKaag0CcGWbw=="; sha512 = "derWDIwsSR9Iq6XOU2LOoRztJ/6M6CegjoOiehXe97ifLbBuFaGaNAtbWKSwCWKw05YCV0ifsV5nA3cFUrbdOQ==";
}; };
dependencies = [ dependencies = [
sources."JSV-4.0.2" sources."JSV-4.0.2"
@ -3063,7 +3063,7 @@ in
sources."commander-2.19.0" sources."commander-2.19.0"
sources."concat-map-0.0.1" sources."concat-map-0.0.1"
sources."convert-source-map-1.6.0" sources."convert-source-map-1.6.0"
sources."core-js-2.5.7" sources."core-js-2.6.0"
sources."debug-2.6.9" sources."debug-2.6.9"
sources."detect-indent-4.0.0" sources."detect-indent-4.0.0"
sources."ejs-2.5.7" sources."ejs-2.5.7"
@ -3141,7 +3141,7 @@ in
sources."trim-right-1.0.1" sources."trim-right-1.0.1"
sources."underscore-1.6.0" sources."underscore-1.6.0"
sources."universalify-0.1.2" sources."universalify-0.1.2"
sources."walk-sync-0.3.3" sources."walk-sync-0.3.4"
sources."which-1.3.1" sources."which-1.3.1"
sources."xml2js-0.2.8" sources."xml2js-0.2.8"
sources."xml2tss-0.0.5" sources."xml2tss-0.0.5"
@ -3161,7 +3161,7 @@ in
packageName = "bower"; packageName = "bower";
version = "1.8.4"; version = "1.8.4";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; url = "http://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
@ -3470,7 +3470,7 @@ in
}; };
dependencies = [ dependencies = [
sources."abbrev-1.1.1" sources."abbrev-1.1.1"
sources."ajv-6.5.5" sources."ajv-6.6.1"
sources."ansi-regex-2.1.1" sources."ansi-regex-2.1.1"
sources."aproba-1.2.0" sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5" sources."are-we-there-yet-1.1.5"
@ -3581,10 +3581,10 @@ in
node-gyp-build = nodeEnv.buildNodePackage { node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build"; name = "node-gyp-build";
packageName = "node-gyp-build"; packageName = "node-gyp-build";
version = "3.5.0"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.1.tgz";
sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; sha512 = "AKJ4SyHiYvqwy5P9GaAnxi5IG3HSEPHV/1YDMlBA0vEEmi7qxeeSfKlCAau3XFvAPFR9EV6gvD9p2b0s8ghyww==";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -3671,7 +3671,7 @@ in
sources."util-deprecate-1.0.2" sources."util-deprecate-1.0.2"
sources."wide-align-1.1.3" sources."wide-align-1.1.3"
sources."wrappy-1.0.2" sources."wrappy-1.0.2"
sources."yallist-3.0.2" sources."yallist-3.0.3"
]; ];
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -3685,10 +3685,10 @@ in
pnpm = nodeEnv.buildNodePackage { pnpm = nodeEnv.buildNodePackage {
name = "pnpm"; name = "pnpm";
packageName = "pnpm"; packageName = "pnpm";
version = "2.18.2"; version = "2.20.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.18.2.tgz"; url = "https://registry.npmjs.org/pnpm/-/pnpm-2.20.1.tgz";
sha512 = "yJu5pCPFmzxD9xQtWay4nI7JdcrpIIom/VwwMmUvU6itN0wAbbyIaGKz57JCu1E+ZfbOvcaOzEmifbypHfFNXw=="; sha512 = "gqYgV+A2Hsfl+dj9B60O9LnwV0ye2TYkazEZ8bAfnHjkyXcMHGd4EvvXMXov5WCfgui/raAQ0xcNZEHWFmfPAg==";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -3709,7 +3709,7 @@ in
}; };
dependencies = [ dependencies = [
sources."adm-zip-0.4.11" sources."adm-zip-0.4.11"
sources."ajv-6.5.5" sources."ajv-6.6.1"
sources."asn1-0.2.4" sources."asn1-0.2.4"
sources."assert-plus-1.0.0" sources."assert-plus-1.0.0"
sources."async-2.6.1" sources."async-2.6.1"

6
pkgs/development/tools/quicktemplate/default.nix
View File

@ -2,15 +2,15 @@
buildGoPackage rec { buildGoPackage rec {
name = "quicktemplate-unstable-${version}"; name = "quicktemplate-unstable-${version}";
version = "2018-09-06"; version = "2018-11-26";
goPackagePath = "github.com/valyala/quicktemplate"; goPackagePath = "github.com/valyala/quicktemplate";
goDeps = ./deps.nix; goDeps = ./deps.nix;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "valyala"; owner = "valyala";
repo = "quicktemplate"; repo = "quicktemplate";
rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/tools/quicktemplate/deps.nix generated
View File

@ -1,4 +1,4 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 # This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[ [
{ {
goPackagePath = "github.com/valyala/bytebufferpool"; goPackagePath = "github.com/valyala/bytebufferpool";

6
pkgs/servers/hydron/default.nix
View File

@ -3,15 +3,15 @@
buildGoPackage rec { buildGoPackage rec {
name = "hydron-unstable-${version}"; name = "hydron-unstable-${version}";
version = "2018-09-25"; version = "2018-10-08";
goPackagePath = "github.com/bakape/hydron"; goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix; goDeps = ./deps.nix;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bakape"; owner = "bakape";
repo = "hydron"; repo = "hydron";
rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c"; rev = "0a834bcaf9af3a6bac8873fad981aa3736115258";
sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca"; sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

34
pkgs/servers/hydron/deps.nix generated
View File

@ -1,12 +1,12 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 # This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[ [
{ {
goPackagePath = "github.com/Masterminds/squirrel"; goPackagePath = "github.com/Masterminds/squirrel";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/Masterminds/squirrel"; url = "https://github.com/Masterminds/squirrel";
rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83"; rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h"; sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
}; };
} }
{ {
@ -14,8 +14,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/bakape/thumbnailer"; url = "https://github.com/bakape/thumbnailer";
rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
}; };
} }
{ {
@ -23,8 +23,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/dimfeld/httptreemux"; url = "https://github.com/dimfeld/httptreemux";
rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5"; rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj"; sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
}; };
} }
{ {
@ -32,8 +32,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/gorilla/handlers"; url = "https://github.com/gorilla/handlers";
rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de"; rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38"; sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
}; };
} }
{ {
@ -59,8 +59,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/lib/pq"; url = "https://github.com/lib/pq";
rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee";
sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10";
}; };
} }
{ {
@ -68,8 +68,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mattn/go-sqlite3"; url = "https://github.com/mattn/go-sqlite3";
rev = "e85a2792f3166972d6619b7051f01a2df254192a"; rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd"; sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
}; };
} }
{ {
@ -86,8 +86,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/valyala/quicktemplate"; url = "https://github.com/valyala/quicktemplate";
rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
}; };
} }
{ {
@ -95,8 +95,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056"; rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd"; sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
}; };
} }
] ]

12
pkgs/servers/meguca/default.nix
View File

@ -1,27 +1,27 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript
, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: , graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }:
buildGoPackage rec { buildGoPackage rec {
name = "meguca-unstable-${version}"; name = "meguca-unstable-${version}";
version = "2018-08-13"; version = "2018-12-06";
goPackagePath = "github.com/bakape/meguca"; goPackagePath = "github.com/bakape/meguca";
goDeps = ./server_deps.nix; goDeps = ./server_deps.nix;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bakape"; owner = "bakape";
repo = "meguca"; repo = "meguca";
rev = "f8b54370ba74b90f2814e6b42ac003a51fe02ce9"; rev = "300b007cab238838f813faa9aad6abb3f22ad4d2";
sha256 = "1036qlvvz0la3fp514kw5qrplm1zsh23ywn2drigniacmqz4m7dv"; sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9";
fetchSubmodules = true; fetchSubmodules = true;
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ];
buildPhase = '' buildPhase = ''
export HOME=`pwd` export HOME=`pwd`
export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server
cd $HOME/go/src/github.com/bakape/meguca cd $HOME/go/src/github.com/bakape/meguca
ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
sed -i "/npm install --progress false --depth 0/d" Makefile sed -i "/npm install --progress false --depth 0/d" Makefile

151
pkgs/servers/meguca/server_deps.nix
View File

@ -1,4 +1,4 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 # This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[ [
{ {
goPackagePath = "github.com/ErikDubbelboer/gspt"; goPackagePath = "github.com/ErikDubbelboer/gspt";
@ -14,8 +14,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/Masterminds/squirrel"; url = "https://github.com/Masterminds/squirrel";
rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47";
sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q";
}; };
} }
{ {
@ -23,8 +23,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/PuerkitoBio/goquery"; url = "https://github.com/PuerkitoBio/goquery";
rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; rev = "2d2796f41742ece03e8086188fa4db16a3a0b458";
sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56";
}; };
} }
{ {
@ -41,8 +41,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/andybalholm/cascadia"; url = "https://github.com/andybalholm/cascadia";
rev = "901648c87902174f774fac311d7f176f8647bdaa"; rev = "680b6a57bda4f657485ad44bdea42342ead737bc";
sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm";
}; };
} }
{ {
@ -59,8 +59,26 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/badoux/goscraper"; url = "https://github.com/badoux/goscraper";
rev = "0213ced7087832e81e8892e8d044150cfc153856"; rev = "363803726ad4e2ab262b4e01362e98458df0b231";
sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48";
};
}
{
goPackagePath = "github.com/bakape/boorufetch";
fetch = {
type = "git";
url = "https://github.com/bakape/boorufetch";
rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0";
sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0";
};
}
{
goPackagePath = "github.com/bakape/captchouli";
fetch = {
type = "git";
url = "https://github.com/bakape/captchouli";
rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680";
sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm";
}; };
} }
{ {
@ -77,8 +95,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/bakape/thumbnailer"; url = "https://github.com/bakape/thumbnailer";
rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d";
sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x";
}; };
} }
{ {
@ -90,22 +108,13 @@
sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2"; sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2";
}; };
} }
{
goPackagePath = "github.com/dchest/captcha";
fetch = {
type = "git";
url = "https://github.com/dchest/captcha";
rev = "6a29415a8364ec2971fdc62d9e415ed53fc20410";
sha256 = "0j0yspx5rlyx7fdfcx74viqc8jlq3nwyd62bdx4gvbd56cppldcm";
};
}
{ {
goPackagePath = "github.com/dimfeld/httptreemux"; goPackagePath = "github.com/dimfeld/httptreemux";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/dimfeld/httptreemux"; url = "https://github.com/dimfeld/httptreemux";
rev = "7f532489e7739b3d49df5c602bf63549881fe753"; rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d";
sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj";
}; };
} }
{ {
@ -158,8 +167,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/gorilla/handlers"; url = "https://github.com/gorilla/handlers";
rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; rev = "350d97a79266938cd77a9192b7d995132d4e2b5b";
sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b";
}; };
} }
{ {
@ -167,17 +176,17 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/gorilla/websocket"; url = "https://github.com/gorilla/websocket";
rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
}; };
} }
{ {
goPackagePath = "github.com/kardianos/osext"; goPackagePath = "github.com/julienschmidt/httprouter";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/kardianos/osext"; url = "https://github.com/julienschmidt/httprouter";
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; rev = "26a05976f9bf5c3aa992cc20e8588c359418ee58";
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; sha256 = "0bmvrgg373fxwqsr6nri01bmi9qdj6knxkmnbw70h9rmi2d9c585";
}; };
} }
{ {
@ -203,26 +212,17 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/lib/pq"; url = "https://github.com/lib/pq";
rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee";
sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10";
}; };
} }
{ {
goPackagePath = "github.com/mailru/easyjson"; goPackagePath = "github.com/mattn/go-sqlite3";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mailru/easyjson"; url = "https://github.com/mattn/go-sqlite3";
rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; rev = "6a9185d7b1f12363e2c904449d374b63b6093b16";
sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki";
};
}
{
goPackagePath = "github.com/mholt/archiver";
fetch = {
type = "git";
url = "https://github.com/mholt/archiver";
rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3";
sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb";
}; };
} }
{ {
@ -230,8 +230,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/nwaples/rardecode"; url = "https://github.com/nwaples/rardecode";
rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7";
sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g";
}; };
} }
{ {
@ -248,8 +248,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/oschwald/maxminddb-golang"; url = "https://github.com/oschwald/maxminddb-golang";
rev = "c5bec84d1963260297932a1b7a1753c8420717a7"; rev = "ed835b22606182ff576f244643e52b25b7d6c4e7";
sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39"; sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw";
}; };
} }
{ {
@ -257,8 +257,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/otium/ytdl"; url = "https://github.com/otium/ytdl";
rev = "b071cb3eb1579608df3b52084a017c5753b325e6"; rev = "0227c2bacb82a434f2332d7d8c64093615c08a40";
sha256 = "01ankrjgdcw0ncwv0xzqh74xy22vdl2nza0arga72zrakpgk8nw0"; sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs";
}; };
} }
{ {
@ -266,8 +266,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/pierrec/lz4"; url = "https://github.com/pierrec/lz4";
rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"; rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e";
sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs"; sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki";
}; };
} }
{ {
@ -275,8 +275,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/sevlyar/go-daemon"; url = "https://github.com/sevlyar/go-daemon";
rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1";
sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01";
}; };
} }
{ {
@ -284,8 +284,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/sirupsen/logrus"; url = "https://github.com/sirupsen/logrus";
rev = "e4b0c6d7829bcf64435536c4a88f4088a3c76203"; rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39";
sha256 = "1s3m83wv1wjv95nhkbvml56c12z75x85wlmqill3zqvlm9az6bzg"; sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4";
}; };
} }
{ {
@ -293,8 +293,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/ulikunitz/xz"; url = "https://github.com/ulikunitz/xz";
rev = "636d36a76670e6c700f22fd5f4588679ff2896c4"; rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d";
sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g"; sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
}; };
} }
{ {
@ -302,8 +302,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/valyala/bytebufferpool"; url = "https://github.com/valyala/bytebufferpool";
rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf";
sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag";
}; };
} }
{ {
@ -311,8 +311,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/valyala/quicktemplate"; url = "https://github.com/valyala/quicktemplate";
rev = "a91e0946457b6583004fbfc159339b8171423aed"; rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
}; };
} }
{ {
@ -320,8 +320,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/crypto"; url = "https://go.googlesource.com/crypto";
rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447";
sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";
}; };
} }
{ {
@ -329,8 +329,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0";
sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k";
}; };
} }
{ {
@ -338,8 +338,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/sys"; url = "https://go.googlesource.com/sys";
rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695";
sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw";
}; };
} }
{ {
@ -347,8 +347,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/text"; url = "https://go.googlesource.com/text";
rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
}; };
} }
{ {
@ -360,4 +360,13 @@
sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
}; };
} }
{
goPackagePath = "gopkg.in/mholt/archiver.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mholt/archiver.v2";
rev = "de0d89e255e17c8d75a40122055763e743ab0593";
sha256 = "02fsc0za0yi3dg0r5caa8vpxz6kqxjxxlmwzzj5899dlmdvqk57g";
};
}
] ]