chaos/piped-flake
1
0
Fork 0
Code Issues 1 Activity

update to latest piped and add more proxy options

Browse source
This commit is contained in:
chaos 2023-09-30 17:07:26 +01:00
parent 2a03d86df5
commit 705764f62d
No known key found for this signature in database
5 changed files with 809 additions and 798 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -27,6 +27,9 @@
jdk = final.openjdk19;
};
piped-proxy = final.callPackage ./packages/proxy {};
piped-proxy-openssl = piped-proxy.override { withOpenSSL = true; };
piped-proxy-minimal = piped-proxy.override { withAVIF = false; withWebP = false; };
piped-proxy-minimal-openssl = piped-proxy-minimal.override { withOpenSSL = true; };
piped-backend-deps = final.callPackage ./packages/backend/deps.nix {
jdk = final.openjdk19;
};
@ -44,7 +47,8 @@
packages = {
inherit (pkgs) piped-frontend;
inherit (pkgs) piped-backend;
inherit (pkgs) piped-proxy;
inherit (pkgs) piped-proxy piped-proxy-openssl;
inherit (pkgs) piped-proxy-minimal piped-proxy-minimal-openssl;
};
});
}

14
meta.json
View file

@ -1,15 +1,15 @@
{
"frontend": {
"rev": "42792d8ec4a24e9a85af5320a71a3a09e0ee941c",
"sha256": "sha256-/iyHvUgV1doH0adB1jcXWj6zi30k8pmCa0RrAmHmmo8="
"rev": "5a4b0b5d15dfc5af1b3f83adc7c174665e119865",
"sha256": "sha256-6Vni4/Vv5ZCRz8G6QVeUcdcSWXL8h+yNxMnLD6DJUmU="
},
"backend": {
"rev": "af6325b53791ed4f82632ad0c8736c71f0736362",
"sha256": "sha256-VBl5FgHeYO4xrNNP/Yipf210rMJpgZwQFJMsLuEkuwQ=",
"deps-sha256": "sha256-hvrA+IdNFw60QGdf8OdNl+fOz0/EJORp0TSJhg+huSA="
"rev": "11d289cb5bfb42995c885bb757bf3228774ea970",
"sha256": "sha256-EfyKCcxvMBf3cf4iuY1ZcL0IDbB2lOOEpDNc++Pxt58=",
"deps-sha256": "sha256-x1eCsbY5wT/rsLUdzw8Fn2NE2mBPEQcp04fmiU8FjKA="
},
"proxy": {
"rev": "884df6a08e4eacf9494be085f225770307d2c9d2",
"sha256": "sha256-OkA6JVLPK6pog3cByCCAdfBOF5UOrtV4GoeLKGaYOWo="
"rev": "1b86373072bb5cbf42cb461d45043c77f8c80be8",
"sha256": "sha256-WkwnxOY83raWTBk7RDEGQRZngo59VqCKCcoTJSHq51I="
}
}

130
packages/frontend/yarn.lock
View file

@ -1173,9 +1173,9 @@
integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==
"@iconify/utils@^2.1.10":
version "2.1.10"
resolved "https://registry.yarnpkg.com/@iconify/utils/-/utils-2.1.10.tgz#b6a565c61a03cf6c131bef745150046e08d4bac3"
integrity sha512-0/+5hxjzCZ9RoYpqxnOzbnpQyMdZRuHcMxPJeuX+x/aZkAAD/N4TajDjAPT7LpX+M0bfLExj/p0bbDkUfp0lrg==
version "2.1.11"
resolved "https://registry.yarnpkg.com/@iconify/utils/-/utils-2.1.11.tgz#15cf9e15dfeb8e6dd79181dc3994dc1115d042e5"
integrity sha512-M/w3PkN8zQYXi8N6qK/KhnYMfEbbb6Sk8RZVn8g+Pmmu5ybw177RpsaGwpziyHeUsu4etrexYSWq3rwnIqzYCg==
dependencies:
"@antfu/install-pkg" "^0.1.1"
"@antfu/utils" "^0.7.5"
@ -1184,10 +1184,10 @@
kolorist "^1.8.0"
local-pkg "^0.4.3"
"@intlify/bundle-utils@^7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@intlify/bundle-utils/-/bundle-utils-7.3.0.tgz#11048e8aeede313f7492cefcf412359bd31eed76"
integrity sha512-lcnfsLA5Dyd3TbvfoLS0ejLr1vAJYyT6VRYtE4LGNexy1ZD/GEcbXrC33fI9oQp7t2hDlHbCn2o4BBVgXaJFqg==
"@intlify/bundle-utils@^7.4.0":
version "7.4.0"
resolved "https://registry.yarnpkg.com/@intlify/bundle-utils/-/bundle-utils-7.4.0.tgz#b4dc41026d2d98d2e8a2bd83851c1883a48f1254"
integrity sha512-AQfjBe2HUxzyN8ignIk3WhhSuVcSuirgzOzkd17nb337rCbI4Gv/t1R60UUyIqFoFdviLb/wLcDUzTD/xXjv9w==
dependencies:
"@intlify/message-compiler" "^9.4.0"
"@intlify/shared" "^9.4.0"
@ -1200,33 +1200,33 @@
source-map-js "^1.0.1"
yaml-eslint-parser "^1.2.2"
"@intlify/core-base@9.4.1":
version "9.4.1"
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.4.1.tgz#5ab9b624a34af2299a9b45aa331b6516c169b8b5"
integrity sha512-WIwx+elsZbxSMxRG5+LC+utRohFvmZMoDevfKOfnYMLbpCjCSavqTfHJAtfsY6ruowzqXeKkeLhRHbYbjoJx5g==
"@intlify/core-base@9.5.0":
version "9.5.0"
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.5.0.tgz#cbb17a27029ccfd0a83a837931baee08b887af60"
integrity sha512-y3ufM1RJbI/DSmJf3lYs9ACq3S/iRvaSsE3rPIk0MGH7fp+JxU6rdryv/EYcwfcr3Y1aHFlCBir6S391hRZ57w==
dependencies:
"@intlify/message-compiler" "9.4.1"
"@intlify/shared" "9.4.1"
"@intlify/message-compiler" "9.5.0"
"@intlify/shared" "9.5.0"
"@intlify/message-compiler@9.4.1", "@intlify/message-compiler@^9.4.0":
version "9.4.1"
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.4.1.tgz#aa00629a455e23cece3464293834a02994b4fb04"
integrity sha512-aN2N+dUx320108QhH51Ycd2LEpZ+NKbzyQ2kjjhqMcxhHdxtOnkgdx+MDBhOy/CObwBmhC3Nygzc6hNlfKvPNw==
"@intlify/message-compiler@9.5.0", "@intlify/message-compiler@^9.4.0":
version "9.5.0"
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.5.0.tgz#1b4916bf11ca7024f9c15be0d6b4de7be5317808"
integrity sha512-CAhVNfEZcOVFg0/5MNyt+OFjvs4J/ARjCj2b+54/FvFP0EDJI5lIqMTSDBE7k0atMROSP0SvWCkwu/AZ5xkK1g==
dependencies:
"@intlify/shared" "9.4.1"
"@intlify/shared" "9.5.0"
source-map-js "^1.0.2"
"@intlify/shared@9.4.1", "@intlify/shared@^9.4.0":
version "9.4.1"
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.4.1.tgz#bd0d221aaac476b6778a10ddcd0472f812c64e27"
integrity sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng==
"@intlify/shared@9.5.0", "@intlify/shared@^9.4.0":
version "9.5.0"
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.5.0.tgz#185d9ab9f6b4bb4f4d133cfdd51432e9b94c2c44"
integrity sha512-tAxV14LMXZDZbu32XzLMTsowNlgJNmLwWHYzvMUl6L8gvQeoYiZONjY7AUsqZW8TOZDX9lfvF6adPkk9FSRdDA==
"@intlify/unplugin-vue-i18n@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-1.2.0.tgz#ca4ac742140f1eaf4668c9530db5db23069eb604"
integrity sha512-AzjlMZKj9DG10ICDR2VWjfJudHJ1XK2GNSHxw+VmOUYpUm4S0L/a7OAdvgnuY7S4plk1VnPdT4YilpZk+uQcqg==
"@intlify/unplugin-vue-i18n@1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-1.4.0.tgz#581ac40567240209ed0851e27bfc7c9487cf55ec"
integrity sha512-RGDchCRBlDTyVVFgPA1C1XC1uD4xYN81Ma+3EnU6GQ8pBEreraX/PWdPXXzOB6k9GWCQHuqii3atYXhcH3rpSg==
dependencies:
"@intlify/bundle-utils" "^7.3.0"
"@intlify/bundle-utils" "^7.4.0"
"@intlify/shared" "^9.4.0"
"@rollup/pluginutils" "^5.0.2"
"@vue/compiler-sfc" "^3.2.47"
@ -1405,9 +1405,9 @@
integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
"@types/node@*":
version "20.7.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.7.0.tgz#c03de4572f114a940bc2ca909a33ddb2b925e470"
integrity sha512-zI22/pJW2wUZOVyguFaUL1HABdmSVxpXrzIqkjsHmyUjNhPoWM1CKfvVuXfetHhIok4RY573cqS0mZ1SJEnoTg==
version "20.8.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.0.tgz#10ddf0119cf20028781c06d7115562934e53f745"
integrity sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==
"@types/resolve@1.17.1":
version "1.17.1"
@ -1993,12 +1993,12 @@ braces@^3.0.2, braces@~3.0.2:
fill-range "^7.0.1"
browserslist@^4.21.10, browserslist@^4.21.9:
version "4.22.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.0.tgz#6adc8116589ccea8a99d0df79c5de2436199abdb"
integrity sha512-v+Jcv64L2LbfTC6OnRcaxtqJNJuQAVhZKSJfR/6hn7lhnChUXl4amwVviqN1k411BB+3rRoKMitELRn1CojeRA==
version "4.22.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
dependencies:
caniuse-lite "^1.0.30001539"
electron-to-chromium "^1.4.530"
caniuse-lite "^1.0.30001541"
electron-to-chromium "^1.4.535"
node-releases "^2.0.13"
update-browserslist-db "^1.0.13"
@ -2050,10 +2050,10 @@ camelcase@^5.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
caniuse-lite@^1.0.30001539:
version "1.0.30001540"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001540.tgz#a316ca4f2ae673ab02ff0ec533334016d56ff658"
integrity sha512-9JL38jscuTJBTcuETxm8QLsFr/F6v0CYYTEU6r5+qSM98P2Q0Hmu0eG1dTG5GBUmywU3UlcVOUSIJYY47rdFSw==
caniuse-lite@^1.0.30001541:
version "1.0.30001541"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz#b1aef0fadd87fb72db4dcb55d220eae17b81cdb1"
integrity sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==
chalk@^2.4.2:
version "2.4.2"
@ -2296,10 +2296,10 @@ dom-walk@^0.1.0:
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
dompurify@3.0.5:
version "3.0.5"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed"
integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==
dompurify@3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.6.tgz#925ebd576d54a9531b5d76f0a5bef32548351dae"
integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==
duplexer@^0.1.2:
version "0.1.2"
@ -2313,10 +2313,10 @@ ejs@^3.1.6:
dependencies:
jake "^10.8.5"
electron-to-chromium@^1.4.530:
version "1.4.531"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.531.tgz#22966d894c4680726c17cf2908ee82ff5d26ac25"
integrity sha512-H6gi5E41Rn3/mhKlPaT1aIMg/71hTAqn0gYEllSuw9igNWtvQwu185jiCZoZD29n7Zukgh7GVZ3zGf0XvkhqjQ==
electron-to-chromium@^1.4.535:
version "1.4.537"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.537.tgz#aac4101db53066be1e49baedd000a26bc754adc9"
integrity sha512-W1+g9qs9hviII0HAwOdehGYkr+zt7KKdmCcJcjH0mYg6oL8+ioT3Skjmt7BLoAQqXhjf40AXd+HlR4oAWMlXjA==
eme-encryption-scheme-polyfill@^2.1.1:
version "2.1.1"
@ -3445,9 +3445,9 @@ magic-string@^0.25.0, magic-string@^0.25.7:
sourcemap-codec "^1.4.8"
magic-string@^0.30.0, magic-string@^0.30.1, magic-string@^0.30.3:
version "0.30.3"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.3.tgz#403755dfd9d6b398dfa40635d52e96c5ac095b85"
integrity sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==
version "0.30.4"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.4.tgz#c2c683265fc18dda49b56fc7318d33ca0332c98c"
integrity sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==
dependencies:
"@jridgewell/sourcemap-codec" "^1.4.15"
@ -3764,9 +3764,9 @@ postcss-selector-parser@^6.0.13:
util-deprecate "^1.0.2"
postcss@^8.1.10, postcss@^8.4.27, postcss@^8.4.30:
version "8.4.30"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7"
integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==
version "8.4.31"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
@ -3968,9 +3968,9 @@ rollup@^2.43.1, rollup@^2.77.2:
fsevents "~2.3.2"
rollup@^3.27.1:
version "3.29.3"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.3.tgz#97769774ccaa6a3059083d4680fcabd8ead01289"
integrity sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==
version "3.29.4"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
optionalDependencies:
fsevents "~2.3.2"
@ -4387,9 +4387,9 @@ typed-array-length@^1.0.4:
is-typed-array "^1.1.9"
ufo@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.0.tgz#c92f8ac209daff607c57bbd75029e190930a0019"
integrity sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==
version "1.3.1"
resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b"
integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==
unbox-primitive@^1.0.2:
version "1.0.2"
@ -4556,13 +4556,13 @@ vue-eslint-parser@^9.3.1:
lodash "^4.17.21"
semver "^7.3.6"
vue-i18n@9.4.1:
version "9.4.1"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.4.1.tgz#c7402662fe9b40b17798afffa9d8bfa4734dd7f5"
integrity sha512-vnQyYE9LBuNOqPpETIcCaGnAyLEqfeIvDcyZ9T+WBCWFTqWw1J8FuF1jfeDwpHBi5JKgAwgXyq1mt8jp/x/GPA==
vue-i18n@9.5.0:
version "9.5.0"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.5.0.tgz#361a820f591f6d9689435a42763fd1dae224833b"
integrity sha512-NiI3Ph1qMstNf7uhYh8trQBOBFLxeJgcOxBq51pCcZ28Vs18Y7BDS58r8HGDKCYgXdLUYqPDXdKatIF4bvBVZg==
dependencies:
"@intlify/core-base" "9.4.1"
"@intlify/shared" "9.4.1"
"@intlify/core-base" "9.5.0"
"@intlify/shared" "9.5.0"
"@vue/devtools-api" "^6.5.0"
vue-router@4.2.5:

1426
packages/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

29
packages/proxy/default.nix
View file

@ -1,12 +1,18 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nasm,
openssl,
pkg-config,
withOpenSSL ? false,
withMimalloc ? true,
withWebP ? true,
withAVIF ? true,
}: let
meta = builtins.fromJSON (builtins.readFile ../../meta.json);
rev = meta.proxy.rev;
inherit (lib.lists) optional;
in
rustPlatform.buildRustPackage rec {
pname = "piped-proxy";
@ -20,22 +26,17 @@ in
buildNoDefaultFeatures = true;
buildFeatures =
[]
++ (
if withAVIF
then ["avif"]
else []
(
if withOpenSSL
then ["reqwest-native-tls"]
else ["reqwest-rustls"]
)
++ (
if withWebP
then ["webp"]
else []
);
++ (optional withMimalloc "mimalloc")
++ (optional withMimalloc "avif")
++ (optional withMimalloc "webp");
nativeBuildInputs =
if withAVIF
then [nasm]
else [];
buildInputs = optional withOpenSSL openssl;
nativeBuildInputs = [] ++ (optional withAVIF nasm) ++ (optional withOpenSSL pkg-config);
cargoLock = {lockFile = "${src}/Cargo.lock";};
doCheck = false;