Merge pull request #43792 from Chiiruno/dev/hydron

Update: easyjson, hydron, meguca, nodePackages: meguca; Improve: quicktemplate
This commit is contained in:
Silvan Mosberger 2018-08-03 18:10:12 +02:00 committed by GitHub
commit a35a4884c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 377 additions and 224 deletions

View File

@ -1,6 +1,8 @@
{ config, lib, pkgs, ... }:
let cfg = config.services.hydron;
let
cfg = config.services.hydron;
postgres = config.services.postgresql;
in with lib; {
options.services.hydron = {
enable = mkEnableOption "hydron";
@ -25,6 +27,38 @@ in with lib; {
'';
};
password = mkOption {
type = types.str;
default = "hydron";
example = "dumbpass";
description = "Password for the hydron database.";
};
passwordFile = mkOption {
type = types.path;
default = "/run/keys/hydron-password-file";
example = "/home/okina/hydron/keys/pass";
description = "Password file for the hydron database.";
};
postgresArgs = mkOption {
type = types.str;
description = "Postgresql connection arguments.";
example = ''
{
"driver": "postgres",
"connection": "user=hydron password=dumbpass dbname=hydron sslmode=disable"
}
'';
};
postgresArgsFile = mkOption {
type = types.path;
default = "/run/keys/hydron-postgres-args";
example = "/home/okina/hydron/keys/postgres";
description = "Postgresql connection arguments file.";
};
listenAddress = mkOption {
type = types.nullOr types.str;
default = null;
@ -47,16 +81,36 @@ in with lib; {
};
config = mkIf cfg.enable {
security.sudo.enable = cfg.enable;
services.postgresql.enable = cfg.enable;
services.hydron.passwordFile = mkDefault (pkgs.writeText "hydron-password-file" cfg.password);
services.hydron.postgresArgsFile = mkDefault (pkgs.writeText "hydron-postgres-args" cfg.postgresArgs);
services.hydron.postgresArgs = mkDefault ''
{
"driver": "postgres",
"connection": "user=hydron password=${cfg.password} dbname=hydron sslmode=disable"
}
'';
systemd.services.hydron = {
description = "hydron";
after = [ "network.target" ];
after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
# Ensure folder exists and permissions are correct
mkdir -p ${escapeShellArg cfg.dataDir}/images
# Ensure folder exists or create it and permissions are correct
mkdir -p ${escapeShellArg cfg.dataDir}/{.hydron,images}
ln -sf ${escapeShellArg cfg.postgresArgsFile} ${escapeShellArg cfg.dataDir}/.hydron/db_conf.json
chmod 750 ${escapeShellArg cfg.dataDir}
chown -R hydron:hydron ${escapeShellArg cfg.dataDir}
# Ensure the database is correct or create it
${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
-SDR hydron || true
${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
-T template0 -E UTF8 -O hydron hydron || true
${pkgs.sudo}/bin/sudo -u hydron ${postgres.package}/bin/psql \
-c "ALTER ROLE hydron WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true
'';
serviceConfig = {
@ -101,5 +155,9 @@ in with lib; {
};
};
imports = [
(mkRenamedOptionModule [ "services" "hydron" "baseDir" ] [ "services" "hydron" "dataDir" ])
];
meta.maintainers = with maintainers; [ chiiruno ];
}

View File

@ -1,65 +1,71 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.meguca;
postgres = config.services.postgresql;
in
{
in with lib; {
options.services.meguca = {
enable = mkEnableOption "meguca";
baseDir = mkOption {
dataDir = mkOption {
type = types.path;
default = "/run/meguca";
default = "/var/lib/meguca";
example = "/home/okina/meguca";
description = "Location where meguca stores it's database and links.";
};
password = mkOption {
type = types.str;
default = "meguca";
example = "dumbpass";
description = "Password for the meguca database.";
};
passwordFile = mkOption {
type = types.path;
default = "/run/keys/meguca-password-file";
example = "/home/okina/meguca/keys/pass";
description = "Password file for the meguca database.";
};
reverseProxy = mkOption {
type = types.nullOr types.str;
default = null;
example = "192.168.1.5";
description = "Reverse proxy IP.";
};
sslCertificate = mkOption {
type = types.nullOr types.str;
default = null;
example = "/home/okina/meguca/ssl.cert";
description = "Path to the SSL certificate.";
};
listenAddress = mkOption {
type = types.nullOr types.str;
default = null;
example = "127.0.0.1:8000";
description = "Listen on a specific IP address and port.";
};
cacheSize = mkOption {
type = types.nullOr types.int;
default = null;
example = 256;
description = "Cache size in MB.";
};
postgresArgs = mkOption {
type = types.str;
default = "user=meguca password=" + cfg.password + " dbname=meguca sslmode=disable";
example = "user=meguca password=dumbpass dbname=meguca sslmode=disable";
description = "Postgresql connection arguments.";
};
postgresArgsFile = mkOption {
type = types.path;
default = "/run/keys/meguca-postgres-args";
example = "/home/okina/meguca/keys/postgres";
description = "Postgresql connection arguments file.";
};
@ -83,18 +89,11 @@ in
};
config = mkIf cfg.enable {
security.sudo.enable = cfg.enable == true;
services.postgresql.enable = cfg.enable == true;
services.meguca.passwordFile = mkDefault (toString (pkgs.writeTextFile {
name = "meguca-password-file";
text = cfg.password;
}));
services.meguca.postgresArgsFile = mkDefault (toString (pkgs.writeTextFile {
name = "meguca-postgres-args";
text = cfg.postgresArgs;
}));
security.sudo.enable = cfg.enable;
services.postgresql.enable = cfg.enable;
services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password);
services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs);
services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable";
systemd.services.meguca = {
description = "meguca";
@ -102,10 +101,11 @@ in
wantedBy = [ "multi-user.target" ];
preStart = ''
# Ensure folder exists and links are correct or create them
mkdir -p ${cfg.baseDir}
chmod 750 ${cfg.baseDir}
ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir}
# Ensure folder exists or create it and links and permissions are correct
mkdir -p ${escapeShellArg cfg.dataDir}
ln -sf ${pkgs.meguca}/share/meguca/www ${escapeShellArg cfg.dataDir}
chmod 750 ${escapeShellArg cfg.dataDir}
chown -R meguca:meguca ${escapeShellArg cfg.dataDir}
# Ensure the database is correct or create it
${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
@ -113,47 +113,46 @@ in
${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
-T template0 -E UTF8 -O meguca meguca || true
${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \
-c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
-c "ALTER ROLE meguca WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true
'';
script = ''
cd ${cfg.baseDir}
cd ${escapeShellArg cfg.dataDir}
${pkgs.meguca}/bin/meguca -d "$(cat ${cfg.postgresArgsFile})"\
${optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"}\
${optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"}\
${optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"}\
${optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"}\
${optionalString (cfg.compressTraffic) " -g"}\
${optionalString (cfg.assumeReverseProxy) " -r"}\
${optionalString (cfg.httpsOnly) " -s"} start
'';
${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"''
+ optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"
+ optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"
+ optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"
+ optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"
+ optionalString (cfg.compressTraffic) " -g"
+ optionalString (cfg.assumeReverseProxy) " -r"
+ optionalString (cfg.httpsOnly) " -s" + " start";
serviceConfig = {
PermissionsStartOnly = true;
Type = "forking";
User = "meguca";
Group = "meguca";
RuntimeDirectory = "meguca";
ExecStop = "${pkgs.meguca}/bin/meguca stop";
};
};
users = {
groups.meguca.gid = config.ids.gids.meguca;
users.meguca = {
description = "meguca server service user";
home = cfg.baseDir;
home = cfg.dataDir;
createHome = true;
group = "meguca";
uid = config.ids.uids.meguca;
};
groups.meguca = {
gid = config.ids.gids.meguca;
members = [ "meguca" ];
};
};
};
imports = [
(mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ])
];
meta.maintainers = with maintainers; [ chiiruno ];
}

View File

@ -571,13 +571,13 @@ let
sha512 = "awiTDstwQfX6026T7oC01AoP7knJoM5IT1tgx9STIM4hQzNQlkW8keTxNC+/xxpMgP657ebHMTqrsQ4qtfSJKg==";
};
};
"@types/lodash-4.14.115" = {
"@types/lodash-4.14.116" = {
name = "_at_types_slash_lodash";
packageName = "@types/lodash";
version = "4.14.115";
version = "4.14.116";
src = fetchurl {
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz";
sha512 = "9K/P4XMQxk61omAzQh3bbbFiqnG17eLcFysjlAYz0aPcYrVo8T+ujaCeIeY0Gpzux7x1YbxtEtLKB7ZWf79qdg==";
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz";
sha512 = "lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==";
};
};
"@types/make-dir-1.0.3" = {
@ -2245,13 +2245,13 @@ let
sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
};
};
"asn1-0.2.3" = {
"asn1-0.2.4" = {
name = "asn1";
packageName = "asn1";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
};
};
"asn1.js-4.10.1" = {
@ -2542,22 +2542,22 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
"aws-sdk-2.285.1" = {
"aws-sdk-2.286.2" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.285.1";
version = "2.286.2";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.285.1.tgz";
sha512 = "lkroCYcnb7UWR/jbaW6wyjAeGROrsBFWyqUukQjICuCV4a0Mapnjsxefl2A/z+0SX3gnBN7owUb/60UjQSHpzA==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz";
sha512 = "46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw==";
};
};
"aws-sign-0.2.0" = {
"aws-sign-0.2.1" = {
name = "aws-sign";
packageName = "aws-sign";
version = "0.2.0";
version = "0.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.1.tgz";
sha512 = "cQFl6jK/Lq416OqpT+lb1RIay1wShuQjHF3/kAJbyMvruV8vSpDahaGNkbeupdGRgXR8Ii0O/ZIbTQPdp+l3pA==";
};
};
"aws-sign2-0.6.0" = {
@ -2947,13 +2947,13 @@ let
sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
};
};
"azure-storage-2.10.0" = {
"azure-storage-2.10.1" = {
name = "azure-storage";
packageName = "azure-storage";
version = "2.10.0";
version = "2.10.1";
src = fetchurl {
url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.0.tgz";
sha1 = "020ac343262c5552ef86516cbb7679241e95e4de";
url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.1.tgz";
sha512 = "rnFo1uMIPtilusRCpK91tfY3P4Q7qRsDNwriXdp+OeTIGkGt0cTxL4mhqYfNPYPK+WBQmBdGWhOk+iROM05dcw==";
};
};
"babel-code-frame-6.26.0" = {
@ -5269,6 +5269,15 @@ let
sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a";
};
};
"clean-css-4.2.0" = {
name = "clean-css";
packageName = "clean-css";
version = "4.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz";
sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c";
};
};
"clean-stack-1.3.0" = {
name = "clean-stack";
packageName = "clean-stack";
@ -14974,13 +14983,13 @@ let
sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==";
};
};
"isbinaryfile-3.0.2" = {
"isbinaryfile-3.0.3" = {
name = "isbinaryfile";
packageName = "isbinaryfile";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz";
sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==";
};
};
"isexe-1.1.2" = {
@ -22686,13 +22695,13 @@ let
sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
};
};
"psl-1.1.28" = {
"psl-1.1.29" = {
name = "psl";
packageName = "psl";
version = "1.1.28";
version = "1.1.29";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz";
sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==";
url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz";
sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==";
};
};
"pstree.remy-1.1.0" = {
@ -24693,13 +24702,13 @@ let
sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad";
};
};
"sanitize-html-1.18.3" = {
"sanitize-html-1.18.4" = {
name = "sanitize-html";
packageName = "sanitize-html";
version = "1.18.3";
version = "1.18.4";
src = fetchurl {
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.3.tgz";
sha512 = "xoXC9dV3SrfhJDPo9XkLCgLDC5yQ5TQwIpIC8bc/qOCH6DvHwMGYNI2qrdb/EX8RQA7PMYL4th5B+XvijTbVEQ==";
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz";
sha512 = "hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew==";
};
};
"sax-0.3.5" = {
@ -29707,13 +29716,13 @@ let
sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
};
};
"validator-10.4.0" = {
"validator-10.5.0" = {
name = "validator";
packageName = "validator";
version = "10.4.0";
version = "10.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz";
sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg==";
url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz";
sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ==";
};
};
"validator-5.2.0" = {
@ -31511,7 +31520,7 @@ in
dependencies = [
sources."abbrev-1.1.1"
sources."ajv-5.5.2"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -31628,7 +31637,7 @@ in
sources."ansi-styles-2.2.1"
sources."applicationinsights-0.16.0"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-1.4.2"
sources."asynckit-0.4.0"
@ -31745,7 +31754,7 @@ in
sources."request-2.74.0"
];
})
(sources."azure-storage-2.10.0" // {
(sources."azure-storage-2.10.1" // {
dependencies = [
sources."extend-1.2.1"
sources."readable-stream-2.0.6"
@ -32374,7 +32383,7 @@ in
sources."array-shuffle-1.0.1"
sources."ascli-0.3.0"
sources."async-0.2.10"
sources."aws-sign-0.2.0"
sources."aws-sign-0.2.1"
sources."balanced-match-1.0.0"
sources."base64-js-1.3.0"
sources."bencode-2.0.0"
@ -32729,13 +32738,13 @@ in
clean-css = nodeEnv.buildNodePackage {
name = "clean-css";
packageName = "clean-css";
version = "4.1.11";
version = "4.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz";
sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a";
url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz";
sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c";
};
dependencies = [
sources."source-map-0.5.7"
sources."source-map-0.6.1"
];
buildInputs = globalBuildInputs;
meta = {
@ -32871,7 +32880,7 @@ in
sources."array-flatten-1.1.1"
sources."array-map-0.0.0"
sources."array-reduce-0.0.0"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."asn1.js-4.10.1"
(sources."assert-1.4.1" // {
dependencies = [
@ -33571,7 +33580,7 @@ in
sources."arr-flatten-1.1.0"
sources."array-lru-1.1.1"
sources."array-unique-0.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.9.2"
sources."asynckit-0.4.0"
@ -34326,11 +34335,11 @@ in
dependencies = [
sources."JSONStream-1.3.3"
sources."ajv-5.5.2"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.1"
sources."asynckit-0.4.0"
sources."aws-sdk-2.285.1"
sources."aws-sdk-2.286.2"
sources."aws-sign2-0.7.0"
sources."aws4-1.7.0"
sources."base64-js-1.3.0"
@ -34439,7 +34448,7 @@ in
sources."arr-diff-2.0.0"
sources."arr-flatten-1.1.0"
sources."array-unique-0.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-each-1.0.1"
sources."asynckit-0.4.0"
@ -35261,7 +35270,7 @@ in
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."array-find-index-1.0.2"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -35706,7 +35715,7 @@ in
})
sources."argparse-1.0.10"
sources."array-flatten-1.1.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.1"
sources."asynckit-0.4.0"
@ -36071,7 +36080,7 @@ in
sources."proxy-addr-2.0.4"
sources."prr-1.0.1"
sources."pseudomap-1.0.2"
sources."psl-1.1.28"
sources."psl-1.1.29"
sources."punycode-1.4.1"
sources."qs-6.5.1"
sources."range-parser-1.2.0"
@ -36185,7 +36194,7 @@ in
sources."utils-merge-1.0.1"
sources."uuid-3.3.2"
sources."validate-npm-package-license-3.0.3"
sources."validator-10.4.0"
sources."validator-10.5.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
sources."wcwidth-1.0.1"
@ -36889,7 +36898,7 @@ in
sources."@types/glob-5.0.35"
sources."@types/inquirer-0.0.42"
sources."@types/klaw-2.1.1"
sources."@types/lodash-4.14.115"
sources."@types/lodash-4.14.116"
sources."@types/make-dir-1.0.3"
sources."@types/minimatch-3.0.3"
sources."@types/minimist-1.2.0"
@ -37496,7 +37505,7 @@ in
};
dependencies = [
sources."ajv-5.5.2"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-1.0.0"
sources."asynckit-0.4.0"
@ -37812,7 +37821,7 @@ in
sources."ansi-regex-3.0.0"
sources."ansi-styles-3.2.1"
sources."array-flatten-1.1.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -38118,7 +38127,7 @@ in
sources."array-slice-0.2.3"
sources."array-unique-0.3.2"
sources."arraybuffer.slice-0.0.7"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."ast-types-0.11.5"
@ -38165,6 +38174,9 @@ in
sources."is-extendable-0.1.1"
];
})
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
sources."buffer-fill-1.0.0"
sources."buffer-more-ints-0.0.2"
sources."buildmail-4.0.1"
sources."bytes-3.0.0"
@ -38392,7 +38404,7 @@ in
sources."is-typedarray-1.0.0"
sources."is-windows-1.0.2"
sources."isarray-1.0.0"
sources."isbinaryfile-3.0.2"
sources."isbinaryfile-3.0.3"
sources."isobject-3.0.1"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
@ -38977,7 +38989,7 @@ in
sources."ajv-5.5.2"
sources."ansi-regex-2.1.1"
sources."ansi-styles-3.2.0"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-1.5.2"
sources."asynckit-0.4.0"
@ -39127,7 +39139,7 @@ in
sources."prelude-ls-1.1.2"
sources."prompt-1.0.0"
sources."pseudomap-1.0.2"
sources."psl-1.1.28"
sources."psl-1.1.29"
sources."punycode-1.4.1"
sources."qs-6.5.2"
sources."read-1.0.7"
@ -39300,7 +39312,7 @@ in
sources."array-unique-0.3.2"
sources."arrify-1.0.1"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."assign-symbols-1.0.0"
sources."async-1.5.2"
@ -39992,7 +40004,7 @@ in
dependencies = [
sources."ajv-5.5.2"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -40259,7 +40271,7 @@ in
sources."array-flatten-1.1.1"
sources."array-unique-0.2.1"
sources."arraybuffer.slice-0.0.7"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-each-1.0.1"
sources."async-limiter-1.0.0"
@ -40598,7 +40610,7 @@ in
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."assign-symbols-1.0.0"
sources."asynckit-0.4.0"
@ -41391,7 +41403,7 @@ in
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -41544,7 +41556,7 @@ in
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.6.0"
@ -41703,7 +41715,7 @@ in
sources."are-we-there-yet-1.1.5"
sources."array-find-index-1.0.2"
sources."array-flatten-1.1.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-0.9.2"
sources."asynckit-0.4.0"
@ -42447,7 +42459,7 @@ in
sources."argparse-1.0.10"
sources."array-flatten-1.1.1"
sources."array-indexofobject-0.0.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.1.22"
sources."async-limiter-1.0.0"
@ -43005,7 +43017,7 @@ in
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
sources."argparse-0.1.15"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -43497,7 +43509,7 @@ in
sources."argparse-1.0.10"
sources."array-flatten-1.1.1"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.9.2"
sources."asynckit-0.4.0"
@ -44134,7 +44146,7 @@ in
sources."after-0.8.2"
sources."arraybuffer.slice-0.0.6"
sources."async-0.2.10"
sources."aws-sign-0.2.0"
sources."aws-sign-0.2.1"
sources."backo2-1.0.2"
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
@ -44502,7 +44514,7 @@ in
dependencies = [
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-2.6.1"
sources."aws-sign2-0.6.0"
@ -45134,7 +45146,7 @@ in
sources."are-we-there-yet-1.1.5"
sources."array-flatten-1.1.1"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.6.0"
@ -45158,7 +45170,11 @@ in
sources."center-align-0.1.3"
sources."character-parser-2.2.0"
sources."chownr-1.0.1"
sources."clean-css-4.1.11"
(sources."clean-css-4.2.0" // {
dependencies = [
sources."source-map-0.6.1"
];
})
sources."cliui-2.1.0"
sources."co-4.6.0"
sources."code-point-at-1.1.0"
@ -45558,7 +45574,7 @@ in
};
dependencies = [
sources."ajv-5.5.2"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sdk-1.18.0"
@ -45808,7 +45824,7 @@ in
sources."ajv-5.5.2"
sources."array-flatten-1.1.1"
sources."arraybuffer.slice-0.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
@ -46032,7 +46048,7 @@ in
sources."argparse-1.0.10"
sources."array-flatten-2.1.1"
sources."array-uniq-1.0.3"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.9.2"
sources."asynckit-0.4.0"
@ -46217,7 +46233,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safer-buffer-2.1.2"
sources."sanitize-html-1.18.3"
sources."sanitize-html-1.18.4"
sources."semver-4.3.6"
(sources."send-0.15.6" // {
dependencies = [
@ -46390,6 +46406,7 @@ in
sources."rimraf-2.4.5"
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safer-buffer-2.1.2"
sources."semver-4.3.6"
(sources."smartdc-auth-2.3.1" // {
dependencies = [
@ -46419,7 +46436,7 @@ in
sources."spdy-1.32.5"
(sources."sshpk-1.7.1" // {
dependencies = [
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
(sources."dashdash-1.14.1" // {
dependencies = [
@ -46761,7 +46778,7 @@ in
sources."amdefine-1.0.1"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-2.1.2"
sources."asynckit-0.4.0"
@ -47093,7 +47110,7 @@ in
sources."process-nextick-args-2.0.0"
sources."promise-finally-3.0.0"
sources."pseudomap-1.0.2"
sources."psl-1.1.28"
sources."psl-1.1.29"
sources."punycode-1.4.1"
sources."rc-1.2.8"
sources."readable-stream-2.3.6"
@ -47208,7 +47225,7 @@ in
})
sources."array-flatten-1.1.1"
sources."arraybuffer.slice-0.0.7"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.9.2"
sources."async-limiter-1.0.0"
@ -47643,7 +47660,7 @@ in
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."arrify-1.0.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.1"
sources."asynckit-0.4.0"
@ -47932,7 +47949,7 @@ in
sources."adm-zip-0.4.11"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."async-2.6.1"
sources."aws-sign2-0.6.0"
@ -48086,10 +48103,10 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
version = "4.16.3";
version = "4.16.4";
src = fetchurl {
url = "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz";
sha512 = "3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw==";
url = "https://registry.npmjs.org/webpack/-/webpack-4.16.4.tgz";
sha512 = "RqUfwp4qMqv3oFwBQQOoK69C2tdu2FHJEqPABPqgjGDvOIOLqkTOhmmdJjpiRabzNAAH1ahmkA3z4xowlHN+VA==";
};
dependencies = [
sources."@webassemblyjs/ast-1.5.13"
@ -48867,7 +48884,7 @@ in
sources."array-unique-0.3.2"
sources."arrify-1.0.1"
sources."asap-2.0.6"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."ast-types-0.11.5"
@ -50034,7 +50051,7 @@ in
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
sources."arrify-1.0.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
sources."astral-regex-1.0.0"
@ -50466,7 +50483,7 @@ in
sources."process-nextick-args-2.0.0"
sources."proto-list-1.2.4"
sources."pseudomap-1.0.2"
sources."psl-1.1.28"
sources."psl-1.1.29"
sources."punycode-1.4.1"
sources."qs-6.5.2"
sources."query-string-5.1.1"

View File

@ -418,13 +418,13 @@ let
sha1 = "898508da2226f380df904728456849c1501a4b0d";
};
};
"asn1-0.2.3" = {
"asn1-0.2.4" = {
name = "asn1";
packageName = "asn1";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
};
};
"assert-plus-0.2.0" = {
@ -7447,13 +7447,13 @@ let
sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
};
};
"validator-10.4.0" = {
"validator-10.5.0" = {
name = "validator";
packageName = "validator";
version = "10.4.0";
version = "10.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz";
sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg==";
url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz";
sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ==";
};
};
"variable-diff-1.1.0" = {
@ -7919,7 +7919,7 @@ in
sources."arr-flatten-1.1.0"
sources."array-lru-1.1.1"
sources."array-unique-0.2.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-0.9.2"
sources."asynckit-0.4.0"
@ -8445,7 +8445,7 @@ in
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-0.2.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.6.0"
@ -8774,7 +8774,7 @@ in
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."arrify-1.0.1"
sources."asn1-0.2.3"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.1"
sources."asynckit-0.4.0"
@ -9678,7 +9678,7 @@ in
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."valid-url-1.0.9"
sources."validator-10.4.0"
sources."validator-10.5.0"
sources."which-1.3.1"
sources."widest-line-2.0.0"
sources."window-size-0.1.0"

View File

@ -1,20 +1,19 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "easyjson-unstable-${version}";
version = "2018-06-06";
rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
version = "2018-07-30";
goPackagePath = "github.com/mailru/easyjson";
goDeps = ./deps.nix;
src = fetchgit {
inherit rev;
url = "https://github.com/mailru/easyjson";
sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
src = fetchFromGitHub {
owner = "mailru";
repo = "easyjson";
rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
};
goDeps = ./deps.nix;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://github.com/mailru/easyjson";

View File

@ -1,20 +1,19 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "quicktemplate-unstable-${version}";
version = "2018-04-30";
rev = "a91e0946457b6583004fbfc159339b8171423aed";
goPackagePath = "github.com/valyala/quicktemplate";
goDeps = ./deps.nix;
src = fetchgit {
inherit rev;
url = "https://github.com/valyala/quicktemplate";
src = fetchFromGitHub {
owner = "valyala";
repo = "quicktemplate";
rev = "a91e0946457b6583004fbfc159339b8171423aed";
sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
};
goDeps = ./deps.nix;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = "https://github.com/valyala/quicktemplate";

View File

@ -3,26 +3,21 @@
buildGoPackage rec {
name = "hydron-unstable-${version}";
version = "2018-07-15";
version = "2018-07-30";
goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix;
src = fetchFromGitHub {
rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4";
owner = "bakape";
repo = "hydron";
sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r";
rev = "586af9da1e551b2a7128c154200e2e2e32d1af7e";
sha256 = "1lif63kcllsbmv06n3b8ayx89k90lximyp23108blcq456wrf0zi";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ];
# Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593
preBuild = ''
rm go/src/github.com/bakape/hydron/ico.syso
'';
meta = with stdenv.lib; {
homepage = "https://github.com/bakape/hydron";
description = "High performance media tagger and organizer";

View File

@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/bakape/thumbnailer";
rev = "fa88f595f3882773bc425b382eee71e3e2fa1291";
sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf";
rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f";
sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp";
};
}
{
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/handlers";
rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572";
sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v";
rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce";
sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm";
};
}
{
@ -54,13 +54,22 @@
sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
};
}
{
goPackagePath = "github.com/mailru/easyjson";
fetch = {
type = "git";
url = "https://github.com/mailru/easyjson";
rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
};
}
{
@ -68,8 +77,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e";
sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d";
rev = "b3511bfdd742af558b54eb6160aca9446d762a19";
sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808";
};
}
{
@ -90,4 +99,13 @@
sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "49c15d80dfbc983ea25246ee959d970efe09ec09";
sha256 = "1knkww5jfn73frm8m939ck91jkjfapk798xwscm4g991mpcd6j4v";
};
}
]

View File

@ -1,30 +1,26 @@
{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript
, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }:
buildGoPackage rec {
name = "meguca-unstable-${version}";
version = "2018-07-01";
rev = "80db8298b6546c93944251c17fe03371e521671f";
version = "2018-08-02";
goPackagePath = "github.com/bakape/meguca";
goDeps = ./server_deps.nix;
src = fetchgit {
inherit rev;
url = "https://github.com/bakape/meguca";
sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml";
src = fetchFromGitHub {
owner = "bakape";
repo = "meguca";
rev = "9224ab13f6c08bcfee5a930088c35bbfbf7491e1";
sha256 = "1cp7d8a216nap1fzxcb58dgkbxdazs14hs9705h1xgly86cvwgv0";
fetchSubmodules = true;
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [
ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson
emscripten
];
buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ];
buildPhase = ''
export HOME=$PWD
export HOME=`pwd`
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

View File

@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/ErikDubbelboer/gspt";
rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63";
sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq";
rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0";
sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81";
};
}
{
@ -14,8 +14,17 @@
fetch = {
type = "git";
url = "https://github.com/Masterminds/squirrel";
rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a";
sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg";
rev = "cebd809c54c4812b96aadd528be66e01bbe81437";
sha256 = "0xfbxn921h95b5di9cay3bjb8ygam3h718z0plqjdnrqlvqxfbzx";
};
}
{
goPackagePath = "github.com/PuerkitoBio/goquery";
fetch = {
type = "git";
url = "https://github.com/PuerkitoBio/goquery";
rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2";
sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2";
};
}
{
@ -27,6 +36,15 @@
sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j";
};
}
{
goPackagePath = "github.com/andybalholm/cascadia";
fetch = {
type = "git";
url = "https://github.com/andybalholm/cascadia";
rev = "901648c87902174f774fac311d7f176f8647bdaa";
sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
};
}
{
goPackagePath = "github.com/aquilax/tripcode";
fetch = {
@ -36,15 +54,6 @@
sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3";
};
}
{
goPackagePath = "github.com/badoux/goscraper";
fetch = {
type = "git";
url = "https://github.com/badoux/goscraper";
rev = "0213ced7087832e81e8892e8d044150cfc153856";
sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w";
};
}
{
goPackagePath = "github.com/bakape/mnemonics";
fetch = {
@ -59,8 +68,8 @@
fetch = {
type = "git";
url = "https://github.com/bakape/thumbnailer";
rev = "fa88f595f3882773bc425b382eee71e3e2fa1291";
sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf";
rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f";
sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp";
};
}
{
@ -90,6 +99,15 @@
sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
};
}
{
goPackagePath = "github.com/dsnet/compress";
fetch = {
type = "git";
url = "https://github.com/dsnet/compress";
rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f";
sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx";
};
}
{
goPackagePath = "github.com/go-playground/ansi";
fetch = {
@ -104,8 +122,8 @@
fetch = {
type = "git";
url = "https://github.com/go-playground/errors";
rev = "14d2d30656a95a5fa5a17d2e33540269eda5f158";
sha256 = "0w13vgxwc1x780x716kqzzwp9ld3w3jpkclabh2qwpcwx821nhpy";
rev = "9aa88f624b398d37201c30583065aee54071bc0c";
sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh";
};
}
{
@ -117,13 +135,22 @@
sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh";
};
}
{
goPackagePath = "github.com/golang/snappy";
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
};
}
{
goPackagePath = "github.com/gorilla/handlers";
fetch = {
type = "git";
url = "https://github.com/gorilla/handlers";
rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572";
sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v";
rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce";
sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm";
};
}
{
@ -176,8 +203,26 @@
fetch = {
type = "git";
url = "https://github.com/mailru/easyjson";
rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
};
}
{
goPackagePath = "github.com/mholt/archiver";
fetch = {
type = "git";
url = "https://github.com/mholt/archiver";
rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3";
sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb";
};
}
{
goPackagePath = "github.com/nwaples/rardecode";
fetch = {
type = "git";
url = "https://github.com/nwaples/rardecode";
rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6";
sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw";
};
}
{
@ -198,6 +243,24 @@
sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39";
};
}
{
goPackagePath = "github.com/otium/ytdl";
fetch = {
type = "git";
url = "https://github.com/otium/ytdl";
rev = "325bc9755fb5979d67b65939b8ff88f480424c0e";
sha256 = "0r6b9y2jb1cz1q2w722174lk3qvb3ipsi9jj3cizmhq2n6qqfpmk";
};
}
{
goPackagePath = "github.com/pierrec/lz4";
fetch = {
type = "git";
url = "https://github.com/pierrec/lz4";
rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d";
sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs";
};
}
{
goPackagePath = "github.com/sevlyar/go-daemon";
fetch = {
@ -207,13 +270,22 @@
sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "d329d24db4313262a3b0a24d8aeb1dc4bd294fb0";
sha256 = "1jjmh1nd7lcsrxgr6ycv9m9iwmr8dfn5cxynnj16vw3qazihajk7";
};
}
{
goPackagePath = "github.com/ulikunitz/xz";
fetch = {
type = "git";
url = "https://github.com/ulikunitz/xz";
rev = "0c6b41e72360850ca4f98dc341fd999726ea007f";
sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3";
rev = "636d36a76670e6c700f22fd5f4588679ff2896c4";
sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g";
};
}
{
@ -239,8 +311,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
rev = "c126467f60eb25f8f27e5a981f32a87e3965053f";
sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q";
};
}
{
@ -248,8 +320,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9";
sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k";
rev = "f4c29de78a2a91c00474a2e689954305c350adf9";
sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
};
}
{
@ -257,8 +329,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56";
sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0";
rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314";
sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31";
};
}
{
@ -266,8 +338,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127";
sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz";
rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66";
sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg";
};
}
{