Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
99d681c4e7
|
|
@ -37,6 +37,14 @@
|
|||
<link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://v2raya.org">v2rayA</link>, a Linux
|
||||
web GUI client of Project V which supports V2Ray, Xray, SS,
|
||||
SSR, Trojan and Pingtunnel. Available as
|
||||
<link xlink:href="options.html#opt-services.v2raya.enable">services.v2raya</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-23.05-incompatibilities">
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
|
||||
|
||||
- [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -997,6 +997,7 @@
|
|||
./services/video/rtsp-simple-server.nix
|
||||
./services/networking/uptermd.nix
|
||||
./services/networking/v2ray.nix
|
||||
./services/networking/v2raya.nix
|
||||
./services/networking/vdirsyncer.nix
|
||||
./services/networking/vsftpd.nix
|
||||
./services/networking/wasabibackend.nix
|
||||
|
|
|
|||
|
|
@ -52,17 +52,22 @@ let
|
|||
|
||||
runConfigPath = "/run/rslsync/config.json";
|
||||
|
||||
createConfig = pkgs.writeShellScriptBin "create-resilio-config" ''
|
||||
${pkgs.jq}/bin/jq \
|
||||
'.shared_folders |= map(.secret = $ARGS.named[.dir])' \
|
||||
${
|
||||
lib.concatMapStringsSep " \\\n "
|
||||
(entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'')
|
||||
sharedFoldersSecretFiles
|
||||
} \
|
||||
<${configFile} \
|
||||
>${runConfigPath}
|
||||
'';
|
||||
createConfig = pkgs.writeShellScriptBin "create-resilio-config" (
|
||||
if cfg.sharedFolders != [ ] then ''
|
||||
${pkgs.jq}/bin/jq \
|
||||
'.shared_folders |= map(.secret = $ARGS.named[.dir])' \
|
||||
${
|
||||
lib.concatMapStringsSep " \\\n "
|
||||
(entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'')
|
||||
sharedFoldersSecretFiles
|
||||
} \
|
||||
<${configFile} \
|
||||
>${runConfigPath}
|
||||
'' else ''
|
||||
# no secrets, passing through config
|
||||
cp ${configFile} ${runConfigPath};
|
||||
''
|
||||
);
|
||||
|
||||
in
|
||||
{
|
||||
|
|
|
|||
39
nixos/modules/services/networking/v2raya.nix
Normal file
39
nixos/modules/services/networking/v2raya.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options = {
|
||||
services.v2raya = {
|
||||
enable = options.mkEnableOption (mdDoc "the v2rayA service");
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.services.v2raya.enable {
|
||||
environment.systemPackages = [ pkgs.v2raya ];
|
||||
|
||||
systemd.services.v2raya = {
|
||||
unitConfig = {
|
||||
Description = "v2rayA service";
|
||||
Documentation = "https://github.com/v2rayA/v2rayA/wiki";
|
||||
After = [ "network.target" "nss-lookup.target" "iptables.service" "ip6tables.service" ];
|
||||
Wants = [ "network.target" ];
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
User = "root";
|
||||
ExecStart = "${getExe pkgs.v2raya} --log-disable-timestamp";
|
||||
Environment = [ "V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log" ];
|
||||
LimitNPROC = 500;
|
||||
LimitNOFILE = 1000000;
|
||||
Restart = "on-failure";
|
||||
Type = "simple";
|
||||
};
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [ iptables bash iproute2 ]; # required by v2rayA TProxy functionality
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ elliot ];
|
||||
}
|
||||
|
|
@ -1567,8 +1567,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "magit";
|
||||
publisher = "kahole";
|
||||
version = "0.6.18";
|
||||
sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w";
|
||||
version = "0.6.36";
|
||||
sha256 = "sha256-4712BPibXJkkq0XEO9n0ZrdXAcID7IAabu/FOTiTeTo=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "duckstation";
|
||||
version = "unstable-2022-11-18";
|
||||
version = "unstable-2022-12-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stenzek";
|
||||
repo = "duckstation";
|
||||
rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b";
|
||||
sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4=";
|
||||
rev = "1905ce3e0163fd53e56cc949379f74a2e1c6228d";
|
||||
sha256 = "sha256-q6r9VCGwYCTzyZ3s1BAhQiA8FKsue7QUcErGtuLJbCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.27.3";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VrdjP9HlaBg8GY+2HPkQDwqJsoFtzTMz9QtQxhrUdxw=";
|
||||
sha256 = "sha256-VdOXmhfgDzMyspoCFQl64obpQph14XZxR0Nas+crelA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";
|
||||
vendorSha256 = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
|
||||
|
|
@ -22,13 +22,15 @@ buildGoModule rec {
|
|||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then
|
||||
echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red
|
||||
echo '${pname} smoke check passed'
|
||||
runHook preInstallCheck
|
||||
if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then
|
||||
echo '{ "my": { "favourites": { "colour": "blue" } } }' \
|
||||
| $out/bin/dasel put -t json -r json -t string -v "red" "my.favourites.colour" \
|
||||
| grep "red"
|
||||
else
|
||||
echo '${pname} smoke check failed'
|
||||
return 1
|
||||
fi
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "edgetx";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdgeTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-1l5EoDY17+2PDS3eRT3CHksVoZQgNLV9vRDu7nfzlrE=";
|
||||
sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
|
||||
|
|
|
|||
|
|
@ -7,18 +7,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primecount";
|
||||
version = "7.4";
|
||||
version = "7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y=";
|
||||
hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [ primesieve ];
|
||||
buildInputs = [
|
||||
primesieve
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_LIBPRIMESIEVE=ON"
|
||||
|
|
@ -30,6 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kimwalisch/primecount";
|
||||
changelog = "https://github.com/kimwalisch/primecount/blob/v${version}/ChangeLog";
|
||||
description = "Fast prime counting function implementations";
|
||||
longDescription = ''
|
||||
primecount is a command-line program and C/C++ library that counts the
|
||||
|
|
|
|||
|
|
@ -6,19 +6,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "primesieve";
|
||||
version = "8.0";
|
||||
version = "11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM=";
|
||||
hash = "sha256-mYekOfjeGwQzWi3pBXnmRMTV7nghEvHsD+tR7vrTFRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://primesieve.org/";
|
||||
changelog = "https://github.com/kimwalisch/primesieve/blob/v${version}/ChangeLog";
|
||||
description = "Fast C/C++ prime number generator";
|
||||
longDescription = ''
|
||||
primesieve is a command-line program and C/C++ library for quickly
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }:
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
|
||||
|
|
@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ];
|
||||
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
|
||||
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper;
|
||||
buildInputs = [ ncurses ] ++ optionals useX11 [ libX11 ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
preConfigure = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
|
|
|||
|
|
@ -11,15 +11,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "home-assistant-bluetooth";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oOrsZmAXLYsJ19DrQ70O0RpeSz8Jn8oD41Tsc5DVUng=";
|
||||
hash = "sha256-/ne2pnSmeHuwlGCrMC0x/yNDCvB/P4SqmK/wwcmHlJQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -47,7 +48,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Basic bluetooth models used by Home Assistant";
|
||||
changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/main/CHANGELOG.md";
|
||||
changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.home-assistant.members;
|
||||
|
|
|
|||
|
|
@ -1,26 +1,30 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ftfy
|
||||
, mailchecker
|
||||
, openpyxl
|
||||
, orjson
|
||||
, phonenumbers
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, python-decouple
|
||||
, python-fsutil
|
||||
, pythonOlder
|
||||
, python-slugify
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, requests
|
||||
, six
|
||||
, toml
|
||||
, xlrd
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-benedict";
|
||||
version = "0.25.4";
|
||||
version = "0.27.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,25 +33,37 @@ buildPythonPackage rec {
|
|||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4=";
|
||||
hash = "sha256-L1lgP/Lpy+3koT93Z/H27SbraOHXBm1pxx+Ie6Z2AE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"boto3"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
ftfy
|
||||
mailchecker
|
||||
openpyxl
|
||||
phonenumbers
|
||||
python-dateutil
|
||||
python-fsutil
|
||||
python-slugify
|
||||
pyyaml
|
||||
ftfy
|
||||
orjson
|
||||
requests
|
||||
toml
|
||||
xlrd
|
||||
xmltodict
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
orjson
|
||||
pytestCheckHook
|
||||
python-decouple
|
||||
six
|
||||
];
|
||||
|
||||
|
|
@ -59,6 +75,7 @@ buildPythonPackage rec {
|
|||
"test_from_plist_with_valid_url_valid_content"
|
||||
"test_from_query_string_with_valid_url_valid_content"
|
||||
"test_from_toml_with_valid_url_valid_content"
|
||||
"test_from_xls_with_valid_url_valid_content"
|
||||
"test_from_xml_with_valid_url_valid_content"
|
||||
"test_from_yaml_with_valid_url_valid_content"
|
||||
];
|
||||
|
|
@ -70,6 +87,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module with keylist/keypath support";
|
||||
homepage = "https://github.com/fabiocaccamo/python-benedict";
|
||||
changelog = "https://github.com/fabiocaccamo/python-benedict/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
39
pkgs/development/python-modules/python-decouple/default.nix
Normal file
39
pkgs/development/python-modules/python-decouple/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-decouple";
|
||||
version = "3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HBNetwork";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ll0MZb4FaNFF/jvCfj4TkuoAi4m448KaOU3ykvKPbSo=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"decouple"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to handle code and condifuration";
|
||||
homepage = "https://github.com/HBNetwork/python-decouple";
|
||||
changelog = "https://github.com/HBNetwork/python-decouple/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trino-cli";
|
||||
version = "392";
|
||||
version = "403";
|
||||
|
||||
jarfilename = "${pname}-${version}-executable.jar";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s=";
|
||||
sha256 = "sha256-Yo7WQoY99gbXflcms0v3r9w+GXSNOP+CdKDnUZXEs8Q=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
install -D "$src" "$out/share/java/${jarfilename}"
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/trino \
|
||||
makeWrapper ${jre_headless}/bin/java $out/bin/trino \
|
||||
--add-flags "-jar $out/share/java/${jarfilename}"
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.12.0";
|
||||
version = "2022.12.1";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ let
|
|||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.12.0";
|
||||
hassVersion = "2022.12.1";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -206,7 +206,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-EucTvr/XISdRIpbNkLZjSAHubIbEE3VvMf2y5XE7/n8=";
|
||||
hash = "sha256-WpgSWNV9/k1LDkzNftvS9Td73QaFoXhnj7Dk7pT+Zlg=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20221207.0";
|
||||
version = "20221208.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-8sLk9cWbsEkPf3sL0UWhrlxLOUABXKqDrKZfE0HVDjw=";
|
||||
hash = "sha256-llMKmEkPSrb9j7chAVXGvqpLfpmlFlwqiusOH1p+rAQ=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fastly-exporter";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peterbourgon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oeRf/qjoe8ThzuyIGPOWO+5KTY318Fz3TGp5svXBGQU=";
|
||||
sha256 = "sha256-jZXQ5N6xIBk85ae4dPERB0tY5TBeIT6ThG6rLYLHmJ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BBfI5SyTgaoXXHxhraH09YVi43v1mD6Ia8oyh+TYqvA=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "haproxy_exporter";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prometheus";
|
||||
repo = "haproxy_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";
|
||||
sha256 = "sha256-u5o8XpKkuaNzAZAdA33GLd0QJSpqnkEbI8gW22G7FcY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";
|
||||
vendorSha256 = "sha256-lDoW1rkOn2YkEf3QZdWBpm5fdzjkbER35XnXFr57D8c=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, lua5_3
|
||||
, luaPackage ? lua5_3
|
||||
, lua
|
||||
, gettext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.10";
|
||||
|
|
@ -19,16 +18,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
fcitx5
|
||||
luaPackage
|
||||
gettext
|
||||
];
|
||||
buildInputs = [ fcitx5 lua gettext ];
|
||||
|
||||
passthru = {
|
||||
extraLdLibraries = [ lua ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lua support for Fcitx 5";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ symlinkJoin, makeWrapper, fcitx5, fcitx5-lua, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [] }:
|
||||
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }:
|
||||
|
||||
with lib;
|
||||
|
||||
symlinkJoin {
|
||||
name = "fcitx5-with-addons-${fcitx5.version}";
|
||||
|
||||
paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons;
|
||||
paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-gtk ] ++ addons;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -11,7 +13,8 @@ symlinkJoin {
|
|||
wrapProgram $out/bin/fcitx5 \
|
||||
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share" \
|
||||
--suffix PATH : "$out/bin"
|
||||
--suffix PATH : "$out/bin" \
|
||||
--suffix LD_LIBRARY_PATH : ${makeLibraryPath (flatten (map (x: x.extraLdLibraries or []) addons))}
|
||||
|
||||
desktop=share/applications/org.fcitx.Fcitx5.desktop
|
||||
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.33.0";
|
||||
version = "0.34.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u+D7DKa2hb6kd6LPcJydkkChsPKW101bJWXx6C87rPs=";
|
||||
sha256 = "sha256-Va+99+plrRFZNkK8e3BhMTZC6NREziKwjO4vODm6PyI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OxoIWH/eW36fy6xujWHmgAhK6dSodMVASw8rzKFZDSk=";
|
||||
cargoSha256 = "sha256-4Dq/ElyxUD6wLUWxeN/F5RCP2rAWy9iPsnCvcFxk3/8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
|
|
|||
71
pkgs/tools/networking/v2raya/default.nix
Normal file
71
pkgs/tools/networking/v2raya/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, mkYarnPackage
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, v2ray
|
||||
, v2ray-geoip
|
||||
, v2ray-domain-list-community
|
||||
, symlinkJoin
|
||||
}:
|
||||
let
|
||||
pname = "v2raya";
|
||||
version = "2.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2rayA";
|
||||
repo = "v2rayA";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1fWcrMd+TSrlS1H0z7XwVCQzZAa8DAFtlekEZNRMAPA=";
|
||||
};
|
||||
web = mkYarnPackage {
|
||||
inherit pname version;
|
||||
src = "${src}/gui";
|
||||
yarnNix = ./yarn.nix;
|
||||
packageJSON = ./package.json;
|
||||
yarnLock = ./yarn.lock;
|
||||
buildPhase = ''
|
||||
export NODE_OPTIONS=--openssl-legacy-provider
|
||||
ln -s $src/postcss.config.js postcss.config.js
|
||||
OUTPUT_DIR=$out yarn --offline build
|
||||
'';
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
src = "${src}/service";
|
||||
vendorSha256 = "sha256-Ud4pwS0lz7zSTowg3gXNllfDyj8fu33H1L20szxPcOA=";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/v2rayA/v2rayA/conf.Version=${version}"
|
||||
];
|
||||
subPackages = [ "." ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
preBuild = ''
|
||||
cp -a ${web} server/router/web
|
||||
'';
|
||||
postInstall = ''
|
||||
install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications
|
||||
install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
|
||||
substituteInPlace $out/share/applications/v2raya.desktop \
|
||||
--replace 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya'
|
||||
|
||||
wrapProgram $out/bin/v2rayA \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \
|
||||
--prefix XDG_DATA_DIRS ":" ${symlinkJoin {
|
||||
name = "assets";
|
||||
paths = [ v2ray-geoip v2ray-domain-list-community ];
|
||||
}}/share
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "A Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel";
|
||||
homepage = "https://github.com/v2rayA/v2rayA";
|
||||
mainProgram = "v2rayA";
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ elliot ];
|
||||
};
|
||||
}
|
||||
52
pkgs/tools/networking/v2raya/package.json
Normal file
52
pkgs/tools/networking/v2raya/package.json
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{
|
||||
"name": "v2raya",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"license": "GPL-3.0",
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mdi/font": "^5.8.55",
|
||||
"@nuintun/qrcode": "^3.3.0",
|
||||
"@vue/babel-preset-app": "^4.2.2",
|
||||
"axios": "^0.21.1",
|
||||
"buefy": "0.9.3",
|
||||
"clipboard": "^2.0.4",
|
||||
"dayjs": "^1.10.6",
|
||||
"js-base64": "^2.5.1",
|
||||
"nanoid": "^3.1.23",
|
||||
"normalize.css": "^8.0.1",
|
||||
"pace-js": "^1.2.4",
|
||||
"qrcode": "^1.4.2",
|
||||
"register-service-worker": "^1.6.2",
|
||||
"uglifyjs-webpack-plugin": "^1.1.1",
|
||||
"vue": "^2.6.10",
|
||||
"vue-i18n": "^8.15.3",
|
||||
"vue-router": "^3.0.6",
|
||||
"vue-virtual-scroller": "^1.0.10",
|
||||
"vuex": "^3.0.1",
|
||||
"webpack-iconfont-plugin-nodejs": "^1.0.16"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^4.2.2",
|
||||
"@vue/cli-plugin-eslint": "^4.0.5",
|
||||
"@vue/cli-plugin-router": "^4.0.0",
|
||||
"@vue/cli-plugin-vuex": "^4.0.0",
|
||||
"@vue/cli-service": "^4.0.0",
|
||||
"@vue/eslint-config-prettier": "^5.0.0",
|
||||
"babel-eslint": "^10.0.3",
|
||||
"css-loader": "^5.2.0",
|
||||
"eslint": "^5.16.0",
|
||||
"eslint-plugin-prettier": "^3.1.1",
|
||||
"eslint-plugin-vue": "^5.0.0",
|
||||
"highlight.js": "^11.4.0",
|
||||
"prettier": "^1.18.2",
|
||||
"sass": "^1.19.0",
|
||||
"sass-loader": "^8.0.0",
|
||||
"urijs": "^1.19.11",
|
||||
"vue-template-compiler": "^2.6.10"
|
||||
}
|
||||
}
|
||||
9381
pkgs/tools/networking/v2raya/yarn.lock
Normal file
9381
pkgs/tools/networking/v2raya/yarn.lock
Normal file
File diff suppressed because it is too large
Load diff
10101
pkgs/tools/networking/v2raya/yarn.nix
Normal file
10101
pkgs/tools/networking/v2raya/yarn.nix
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -6989,7 +6989,7 @@ with pkgs;
|
|||
|
||||
fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { };
|
||||
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { };
|
||||
fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
|
||||
|
||||
fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };
|
||||
|
||||
|
|
@ -12590,6 +12590,8 @@ with pkgs;
|
|||
|
||||
v2ray = callPackage ../tools/networking/v2ray { };
|
||||
|
||||
v2raya = callPackage ../tools/networking/v2raya { };
|
||||
|
||||
v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { };
|
||||
|
||||
v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };
|
||||
|
|
|
|||
|
|
@ -9010,6 +9010,8 @@ self: super: with self; {
|
|||
|
||||
python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
|
||||
|
||||
python-decouple = callPackage ../development/python-modules/python-decouple { };
|
||||
|
||||
pythondialog = callPackage ../development/python-modules/pythondialog { };
|
||||
|
||||
python-didl-lite = callPackage ../development/python-modules/python-didl-lite { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue