Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -24,6 +24,24 @@ in {
|
||||
The public facing IP of the RustDesk relay.
|
||||
'';
|
||||
};
|
||||
|
||||
extraSignalArgs = mkOption {
|
||||
type = listOf str;
|
||||
default = [];
|
||||
example = [ "-k" "_" ];
|
||||
description = ''
|
||||
A list of extra command line arguments to pass to the `hbbs` process.
|
||||
'';
|
||||
};
|
||||
|
||||
extraRelayArgs = mkOption {
|
||||
type = listOf str;
|
||||
default = [];
|
||||
example = [ "-k" "_" ];
|
||||
description = ''
|
||||
A list of extra command line arguments to pass to the `hbbr` process.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = let
|
||||
@@ -83,11 +101,11 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.rustdesk-signal = lib.mkMerge [ serviceDefaults {
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/hbbs -r ${cfg.relayIP}";
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/hbbs -r ${cfg.relayIP} ${lib.escapeShellArgs cfg.extraSignalArgs}";
|
||||
} ];
|
||||
|
||||
systemd.services.rustdesk-relay = lib.mkMerge [ serviceDefaults {
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/hbbr";
|
||||
serviceConfig.ExecStart = "${cfg.package}/bin/hbbr ${lib.escapeShellArgs cfg.extraRelayArgs}";
|
||||
} ];
|
||||
};
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x42-avldrums";
|
||||
version = "0.4.2";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "avldrums.lv2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L9rLSHHQIM6PqZ397TIxR6O1N9GKAQtDfWCofV5R85E=";
|
||||
hash = "sha256-NNqBZTWjIM97qsXTW/+6T7eOAELi/OwXh4mCYPD/C6I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.288";
|
||||
version = "1.2.289";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NKSqg9lKKwK+b1dPpeQz4gp3KcVd4nZDhZR8+AAMTRc=";
|
||||
hash = "sha256-0BinJVTjD8iDlhK50qVODQIKj1KDwhgOMg3HHstYHeg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GRSGhepnXuTS3hgFanQgEdBtB+eyA7zUJ9W2qpE02LI=";
|
||||
vendorHash = "sha256-YHLa0hTXCswkvVxyNp5ezqyEu18Jfnl9n7JMdqMeBSA=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.42";
|
||||
ptb = "0.0.66";
|
||||
ptb = "0.0.67";
|
||||
canary = "0.0.267";
|
||||
development = "0.0.13";
|
||||
} else {
|
||||
@@ -21,7 +21,7 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-3ocygqp8eiF3n/BVlTp1T1CRsGj56MGp1yPsvBE7/H4=";
|
||||
hash = "sha256-LySb261stSdUWMfCZ6Ca/MZMhnJ+CEEKmm38cuD1k1s=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pydantic
|
||||
pydantic_1
|
||||
pyopenssl
|
||||
pyyaml
|
||||
sentry-sdk
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "obs-teleport";
|
||||
version = "0.6.6";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-teleport";
|
||||
rev = version;
|
||||
sha256 = "sha256-fDLe1GbLZb/rXLiTtvcMqfQo2cG1guDCwLOEf3piPcU=";
|
||||
sha256 = "sha256-r9j9hePA7MFIECCwHJYLHJMUKmYQrHkJ7FM3LhXGFOY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GhIFGnGnwDmuDobMlOWCRFpHTbQlRtJrqXSFwxFydG0=";
|
||||
vendorHash = "sha256-d7Wtc4nrVEf2TA8BI96Vj9BPOgTtfY+1dQVcEsED1ww=";
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
, gpgme
|
||||
, libgpg-error
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "envio";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envio-cli";
|
||||
repo = "envio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HVu2Ua1iu7Z14RUbdDQ4ElOGnfYjZCekFvAolu2lM7w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AVbAHaLARMKGf5ZIygyWWSkg4U1Xkfjwm9XPNZNtUsE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libgpg-error gpgme ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# Remove postPatch when updating to the next envio release
|
||||
# For details see https://github.com/envio-cli/envio/pull/31
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs\
|
||||
--replace 'fn get_version() -> String {' 'fn get_version() -> String { return "${version}".to_string();'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://envio-cli.github.io/home";
|
||||
changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md";
|
||||
description = "Modern and secure CLI tool for managing environment variables";
|
||||
longDescription = ''
|
||||
Envio is a command-line tool that simplifies the management of
|
||||
environment variables across multiple profiles. It allows users to easily
|
||||
switch between different configurations and apply them to their current
|
||||
environment.
|
||||
'';
|
||||
license = with licenses; [ mit asl20 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ afh ];
|
||||
};
|
||||
}
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glauth";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glauth";
|
||||
repo = "glauth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XYNNR3bVLNtAl+vbGRv0VhbLf+em8Ay983jqcW7KDFU=";
|
||||
hash = "sha256-OkkiB1AGO7r7ehpnSJ+cB00crVpZ5Cwy4rAT55LUUdE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SFmGgxDokIbVl3ANDPMCqrB0ck8Wyva2kSV2mgNRogo=";
|
||||
vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
oath-toolkit
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mdbook-pdf-outline";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-STi+54iT+5+Xi0IzGXv2dxVS91+T6fjg3xmbJjekpPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.lxml
|
||||
python3Packages.pypdf
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/HollowMan6/mdbook-pdf";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ nix-julia ];
|
||||
|
||||
};
|
||||
}
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "unstable-2024-02-02";
|
||||
version = "unstable-2024-02-08";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "84b14adc21fcd12b9772f69f9dcf702133fa6551";
|
||||
hash = "sha256-xFMkYjSZajQSflsTF1BtARUZWbnAvBRfN4gK3RAgeIU=";
|
||||
rev = "6e8ab15760db19614122bd54c8bb39217fbcb318";
|
||||
hash = "sha256-bJFqAcEdjMyHSk0iji4jc0Vw45zEAmCqDWjAOIZfXWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "scheme-manpages";
|
||||
version = "unstable-2023-08-27";
|
||||
version = "unstable-2024-02-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schemedoc";
|
||||
repo = "manpages";
|
||||
rev = "44317b20616699b13b2b6276c86d796f4ae0c8dd";
|
||||
hash = "sha256-qxj9sEQYOZ+me2IhDS5S2GRSho4KWWrEm+5MNxfw1VI=";
|
||||
rev = "1ef440525db569799774c83634d28bfa630358da";
|
||||
hash = "sha256-ZBovG9i0qKD6dP4qcLP1T1fke0hC8MmRjZRzxuojd60=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "approvaltests";
|
||||
version = "10.3.0";
|
||||
version = "10.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1f0iTwLREF20Khkd4/xEfxXINJIpc4LfszsvCblS/yM=";
|
||||
hash = "sha256-/UsrUzCd4aYEQ4epZggk2O2esJCUG0DxRseK+s6yJd4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,25 +2,24 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build-system
|
||||
# build system
|
||||
, setuptools
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "asn1crypto";
|
||||
version = "1.5.1-unstable-2023-11-03";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
# Pulling from Github to run tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbond";
|
||||
repo = "asn1crypto";
|
||||
# https://github.com/wbond/asn1crypto/issues/269
|
||||
rev = "b763a757bb2bef2ab63620611ddd8006d5e9e4a2";
|
||||
hash = "sha256-11WajEDtisiJsKQjZMSd5sDog3DuuBzf1PcgSY+uuXY=";
|
||||
rev = version;
|
||||
hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,5 +34,6 @@ buildPythonPackage {
|
||||
description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/wbond/asn1crypto";
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,24 +6,29 @@
|
||||
, pytestCheckHook
|
||||
, python-socks
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, tldextract
|
||||
, whodap
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncwhois";
|
||||
version = "1.0.9";
|
||||
format = "setuptools";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pogzyb";
|
||||
repo = "asyncwhois";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5T/h4YzODH7zFyQpG8qVZetTK7V+Ii9jc+MQFgMUA8w=";
|
||||
hash = "sha256-rJwJhSOFrZZ3WXEZmPMfdosBBW/R5/PMqs0QLnsPMoI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-socks
|
||||
tldextract
|
||||
@@ -38,7 +43,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "python-socks[asyncio]" "python-socks"
|
||||
--replace-fail "python-socks[asyncio]" "python-socks"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
, colorlog
|
||||
, crcmod
|
||||
, pillow
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -31,6 +32,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tests-pillow-10.2.0-compat.patch";
|
||||
url = "https://github.com/liquidctl/liquidctl/commit/c50afa4e610bd2e268e85c347e2644794c817a78.diff";
|
||||
hash = "sha256-1cKk3drl3RybHmnPXdlJoeYK6UDz25jHSS2YS/XLHIY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
setuptools
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pytz";
|
||||
version = "2023.4.0.20240130";
|
||||
version = "2024.1.0.20240203";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-M2dqkL8EsZ+Swz7shYETa+ovNd3RJ1nleaYkoAb9OHo=";
|
||||
hash = "sha256-yTdR7iDfxuBUoBSPj1InuaALeckKTTyfRkcRpzF5yJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknxproject";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "XKNX";
|
||||
repo = "xknxproject";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0tnmD5X2wskyX9AKhn3JKwzZFpkKy5cKaGnzkUyjWhk=";
|
||||
hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -47,8 +47,8 @@ in stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "In-circuit debug and programming for ST-Link devices";
|
||||
license = licenses.bsd3;
|
||||
# upstream says windows, linux/unix but dropped support for macOS in 1.8.0
|
||||
platforms = platforms.linux; # not sure how to express unix without darwin
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = platforms.darwin;
|
||||
maintainers = [ maintainers.bjornfor maintainers.rongcuid ];
|
||||
};
|
||||
}
|
||||
|
||||
+1935
File diff suppressed because it is too large
Load Diff
@@ -22,9 +22,8 @@ let
|
||||
# 2) nix-build -A tree-sitter.updater.update-all-grammars
|
||||
# 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
|
||||
# 4) run the ./result script that is output by that (it updates ./grammars)
|
||||
version = "0.20.8";
|
||||
sha256 = "sha256-278zU5CLNOwphGBUa4cGwjBqRJ87dhHMzFirZB09gYM=";
|
||||
cargoSha256 = "sha256-0avy53pmR7CztDrL+5WAmlqpZwd/EA3Fh10hfPXyXZc=";
|
||||
version = "0.20.9";
|
||||
sha256 = "sha256-NxWqpMNwu5Ajffw1E2q9KS4TgkCH6M+ctFyi9Jp0tqQ=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
@@ -104,7 +103,10 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "tree-sitter";
|
||||
inherit src version cargoSha256;
|
||||
inherit src version;
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
cargoLock.outputHashes."cranelift-bforest-0.102.0" = "sha256-rJeRbRDrAnKb8s98gNn1NTMKuB8B4aOI8Fh6JeLX7as=";
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isDarwin [ Security CoreServices ];
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "faraday-agent-dispatcher";
|
||||
version = "3.0.1";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_agent_dispatcher";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QCxYqLZAPrhcKAFguWT2ygN/OMe2Tr7HtnMx4Kp2bGM=";
|
||||
hash = "sha256-OO9Rxm7jMfQAyyO5plLDWXbfYmPR2egewOMlrhHQTEw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user