Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7d385961eb
44 changed files with 444 additions and 140 deletions
|
|
@ -10904,6 +10904,12 @@
|
|||
githubId = 137805;
|
||||
name = "Alexander Tsvyashchenko";
|
||||
};
|
||||
ne9z = {
|
||||
email = "yuchen@apvc.uk";
|
||||
github = "ne9z";
|
||||
githubId = 77314501;
|
||||
name = "Maurice Zhou";
|
||||
};
|
||||
nebulka = {
|
||||
email = "arapun@proton.me";
|
||||
github = "nebulka1";
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
, srcs
|
||||
|
||||
# These must be updated in tandem with package updates.
|
||||
, cargoShaForVersion ? "23.03.80"
|
||||
, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
|
||||
, cargoShaForVersion ? "23.04.0"
|
||||
, cargoSha256 ? "sha256-96Qe8zdLZdOrU/t6J+JJ6V0PXyFOnJF18qDrk4PZGsA="
|
||||
}:
|
||||
|
||||
# Guard against incomplete updates.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, makeWrapper
|
||||
|
|
|
|||
54
pkgs/applications/misc/schemes/default.nix
Normal file
54
pkgs/applications/misc/schemes/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, libadwaita
|
||||
, libgee
|
||||
, libpanel
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schemes";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "chergert";
|
||||
repo = "schemes";
|
||||
rev = version;
|
||||
hash = "sha256-XUC24KzZSU4+F2JZMsydukvAwEGdMxCnkPG6QHnCw6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
gtksourceview5
|
||||
libpanel
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Edit GtkSourceView style-schemes for an application or platform";
|
||||
homepage = "https://gitlab.gnome.org/chergert/schemes";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ _0xMRTT ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.14.0";
|
||||
version = "0.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AYo1sRzsOuyv0p3X8/TmsWdCBq3Gcqo0J6+B2aI7UIo=";
|
||||
hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0=";
|
||||
};
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
vendorHash = "sha256-ro/m9t8vHxyAS+a42/OkaqhrUs0FPGu0Ns9tn5HyKXg=";
|
||||
vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude broken impala & hive driver
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vhs";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-62FS/FBhQNpj3dAfKfIUKY+IJeeaONzqRu7mG49li+o";
|
||||
hash = "sha256-qtewd4sm3urFwoDkqdUHfr2SvJRR1nVLLE5d28BocYg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BLZ+Ni2dqboqlOEjFNF6oB/vNDlNRCb6AiDH1uSsLw";
|
||||
vendorHash = "sha256-s1ISU7VEH9o7SBF3Vy+2kVZNxOFUYLmh/le5vU8rOqg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubecfg";
|
||||
version = "0.29.1";
|
||||
version = "0.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubecfg";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA=";
|
||||
hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw=";
|
||||
vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
22
pkgs/applications/networking/cluster/kubexit/default.nix
Normal file
22
pkgs/applications/networking/cluster/kubexit/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubexit";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karlkfi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kzom+/Xad6SI9czw4xvmTbJ+bNB9mF2oSq37IFn384U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RA3+S5Pad+4mNUgcZ2Z0K0FKA3Za5o1ko049GM4yQQ8=";
|
||||
ldflags = [ "-s" "-w" ];
|
||||
meta = with lib; {
|
||||
description = "Command supervisor for coordinated Kubernetes pod container termination.";
|
||||
homepage = "https://github.com/karlkfi/kubexit/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
||||
72
pkgs/applications/networking/p2p/pyrosimple/default.nix
Normal file
72
pkgs/applications/networking/p2p/pyrosimple/default.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, python3Packages
|
||||
, nix-update-script
|
||||
, pyrosimple
|
||||
, testers
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, bencode-py
|
||||
, apscheduler
|
||||
, jinja2
|
||||
, python-daemon
|
||||
, importlib-resources
|
||||
, parsimonious
|
||||
, prometheus-client
|
||||
, prompt-toolkit
|
||||
, requests
|
||||
, shtab
|
||||
, inotify
|
||||
, withInotify ? stdenv.isLinux
|
||||
, python-box
|
||||
, tomli
|
||||
, tomli-w
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "pyrosimple";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bencode-py
|
||||
apscheduler
|
||||
jinja2
|
||||
python-daemon
|
||||
importlib-resources
|
||||
parsimonious
|
||||
prometheus-client
|
||||
prompt-toolkit
|
||||
requests
|
||||
shtab
|
||||
python-box
|
||||
tomli
|
||||
tomli-w
|
||||
] ++ lib.optional withInotify inotify;
|
||||
|
||||
in buildPythonPackage {
|
||||
inherit pname version src propagatedBuildInputs;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = testers.testVersion {
|
||||
package = pyrosimple;
|
||||
command = "pyroadmin --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = let inherit (lib) licenses platforms maintainers;
|
||||
in {
|
||||
homepage = "https://kannibalox.github.io/pyrosimple/";
|
||||
description = "A rTorrent client and Python 3 fork of the pyrocore tools";
|
||||
license = licenses.gpl3Plus;
|
||||
changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
|
||||
platforms = platforms.all;
|
||||
maintainers = builtins.attrValues { inherit (maintainers) ne9z; };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jmVgrrbxkvzDkUYpNivz3jOOEEkr90iS5W4aY3L7Cug=";
|
||||
sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8YmApeijOmWFfLu4UJTa1Ufn0RbaO4TKe7QHvjluMRg=";
|
||||
vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "23.04.05";
|
||||
version = "23.04.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU=";
|
||||
sha256 = "sha256-pc5GwxU4KP6PktPvuCYVzJORVmMvC8GdBPr7QSN2cM0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
{ lib, mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, automakeAddFlags
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-dict";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
sha256 = "sha256-UEkHB+i6hkTTjX62GCnr4uiCdZANuffSx2Nb2DF/pT4=";
|
||||
sha256 = "sha256-sU9V2cQUFG5571c7xrVSDCxanAbbnCUg2YLZ2uzoPJ0=";
|
||||
|
||||
patches = [ ./configure-gio.patch ];
|
||||
|
||||
|
|
@ -15,7 +23,13 @@ mkXfceDerivation {
|
|||
automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS
|
||||
'';
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfce4-panel
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Dictionary Client for the Xfce desktop environment";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,28 @@
|
|||
{ lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-time-out-plugin";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
rev-prefix = "xfce4-time-out-plugin-";
|
||||
odd-unstable = false;
|
||||
sha256 = "sha256-xfkQjlUfvm0YXs3bRJD4W/71VkaPq3Y+cDFVNiL/bjc=";
|
||||
sha256 = "sha256-sm6y3t4nngZDg4Q8S3SVkNR++XkCKysQePN6Qei1OY8=";
|
||||
|
||||
buildInputs = [
|
||||
gtk3 libxfce4ui libxfce4util xfce4-panel xfconf
|
||||
glib
|
||||
gtk3
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfce4-panel
|
||||
xfconf
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,32 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower,
|
||||
libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, gitUpdater }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, glib
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libsoup
|
||||
, upower
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
, hicolor-icon-theme
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
let
|
||||
category = "panel-plugins";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-weather-plugin";
|
||||
version = "0.11.0";
|
||||
pname = "xfce4-weather-plugin";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-4yQuqVHVG8D97R0CpPH2Yr7Bah+xDIVfcb2mVBoRU/w=";
|
||||
sha256 = "sha256-pFFG+aDc3JXRkcCcZK0nmuKJz4+BHEQz4I4xplaEUjk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -20,10 +35,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxml2
|
||||
libsoup
|
||||
upower
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfce4-panel
|
||||
xfconf
|
||||
hicolor-icon-theme
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.13.0",
|
||||
"sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=",
|
||||
"depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM="
|
||||
"version": "0.14.5",
|
||||
"sha256": "sha256-F0c1vyeie8sf11SHfDKb8v1DZ5No3Rr3PPj3jMg0veg=",
|
||||
"depsSha256": "sha256-/lKZ9Ns32A/elJTez72mH2tZ7ujwEX9p4FIKHpfGq78="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "23.1.2";
|
||||
version = "23.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
hash = "sha256-vtzcKPOxmfEl8IF7/hNGfeZmX+AdrHydeYsyYuB1B4o=";
|
||||
hash = "sha256-XxwB5C1NBjq6cjlfzYmvudH6dlItFYSU9dd5DwH7tH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -164,6 +164,7 @@ let
|
|||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
|
||||
qtpositioning = callPackage ../modules/qtpositioning.nix {};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
|
|
|
|||
|
|
@ -22,6 +22,17 @@ let
|
|||
in
|
||||
lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
||||
// {
|
||||
# Has no kde/5.15 branch
|
||||
qtpositioning = rec {
|
||||
version = "5.15.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtpositioning";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L/P+yAQItm3taPpCNoOOm7PNdOFZiIwJJYflk6JDWvU=";
|
||||
};
|
||||
};
|
||||
|
||||
# qtwebkit does not have an official release tarball on the qt mirror and is
|
||||
# mostly maintained by the community.
|
||||
qtwebkit = rec {
|
||||
|
|
|
|||
14
pkgs/development/libraries/qt-5/modules/qtpositioning.nix
Normal file
14
pkgs/development/libraries/qt-5/modules/qtpositioning.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ qtModule
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtserialport
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
qtModule {
|
||||
pname = "qtpositioning";
|
||||
qtInputs = [ qtbase qtdeclarative qtserialport ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }:
|
||||
let
|
||||
pname = "pdlib";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
|
|
@ -10,7 +10,7 @@ buildPecl {
|
|||
owner = "goodspb";
|
||||
repo = "pdlib";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
|
||||
sha256 = "sha256-AKZ3F2XzEQCeZkacSXBinxeGQrHBmqjP7mDGQ3RBAiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,34 +1,71 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, python3Packages, numpy, httpx, grpcio, typing-extensions, grpcio-tools, pydantic, urllib3, h2 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, grpcio
|
||||
, grpcio-tools
|
||||
, h2
|
||||
, httpx
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qdrant-client";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "qdrant_client";
|
||||
inherit version;
|
||||
hash = "sha256-tiWPQXjYkUM77rgKYbQG4jdi9c/I2WTMq5y+9zLax/0=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rpNTV3VBTND39iW/kve0aG1KJzAIl1whmhH+e6RbOhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
httpx
|
||||
grpcio
|
||||
typing-extensions
|
||||
grpcio-tools
|
||||
pydantic
|
||||
urllib3
|
||||
h2
|
||||
];
|
||||
|
||||
# postPatch = ''
|
||||
# substituteInPlace setup.cfg \
|
||||
# --replace "validators>=0.18.2,<0.20.0" "validators>=0.18.2,<0.21.0"
|
||||
# '';
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy httpx grpcio typing-extensions grpcio-tools pydantic urllib3 h2 ];
|
||||
pythonImportsCheck = [
|
||||
"qdrant_client"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_conditional_payload_update"
|
||||
"test_locks"
|
||||
"test_multiple_vectors"
|
||||
"test_points_crud"
|
||||
"test_qdrant_client_integration"
|
||||
"test_quantization_config"
|
||||
"test_record_upload"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/qdrant/qdrant-client";
|
||||
description = "Python client for Qdrant vector search engine";
|
||||
homepage = "https://github.com/qdrant/qdrant-client";
|
||||
changelog = "https://github.com/qdrant/qdrant-client/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pbr
|
||||
, flit-core
|
||||
, flit-scm
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ssdp";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codingjoe";
|
||||
|
|
@ -22,29 +23,28 @@ buildPythonPackage rec {
|
|||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pbr
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
flit-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pytest-runner" "" \
|
||||
--replace "--cov=ssdp" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "ssdp" ];
|
||||
pythonImportsCheck = [
|
||||
"ssdp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)";
|
||||
homepage = "https://github.com/codingjoe/ssdp";
|
||||
changelog = "https://github.com/codingjoe/ssdp/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "5.2.0";
|
||||
version = "5.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pDcrna+DEtgjaaqmSZcpem8Ea8B8oJ91159ayAkztBQ=";
|
||||
hash = "sha256-cr2nv5vnUo4bl6W7rLBxbN9qDJWXsT/b+jZM7DwTBxM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tablib";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
version = "3.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA=";
|
||||
hash = "sha256-d+qX+vb5Kn4ZjAW9DGkPPLpXuD6kWmNrcvlny2/m8WA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "titlecase";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppannuto";
|
||||
repo = "python-titlecase";
|
||||
rev = "v${version}";
|
||||
sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.12.6";
|
||||
version = "2.13.0";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "sha256-0AOrjM7wUMgyKLmeoAPMY7O/YWXmqb5OBJGlGV5JFR0=";
|
||||
sha256 = "sha256-K74o/qEC3DeR8lclJpkIXp6cAP6GLkK5QWJ6HzLxE8M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.46.0";
|
||||
version = "0.46.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ne/i8LLNCo5Kg0xAL/ZexR5uRmZLXcgZ6yZNT5vSYb0=";
|
||||
hash = "sha256-oMf1uUD+7z42Z6bfMxNCWNFu/WwdEqBocVbbfe2OPbo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K+/xJ9ei+LyWodubRw5mFzi4U1V1MB5h4nUuPrTASBY=";
|
||||
vendorHash = "sha256-1S3my0/77LiiGZDemVrYzN1jMcZdTyd404y67euraeI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.17.17";
|
||||
version = "0.17.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UPY/edmriacHqQ030nvYsuRj6OwdazFbsCs1oHAahaU=";
|
||||
hash = "sha256-RiVyPqQzww5Iw24XI6Dmeh2RqTRQOkmalPjKvl3Nyg4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jd-diff-patch";
|
||||
version = "1.6.1";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephburnett";
|
||||
repo = "jd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ti7eElLplnYGP7v1VuGpyeZ3ZIau6Ffx4ACMBDIBROw=";
|
||||
sha256 = "sha256-fi+vj1vHhgw2OPQqQ0827P6Axy/cio0UVFLeD/nhFvw=";
|
||||
};
|
||||
|
||||
# not including web ui
|
||||
excludedPackages = [ "gae" "pack" ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Commandline utility and Go library for diffing and patching JSON values";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "dot-language-server";
|
||||
version = "1.1.26";
|
||||
version = "1.1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikeee";
|
||||
repo = "dot-language-server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wv+Bw+mcc4vn1CfjIy5vAg5Kw7TUf+flcqLguvQVaCQ=";
|
||||
hash = "sha256-Dha6S+qc9rwPvxUkBXYUomyKckEcqp/ESU/24GkrmpA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-w7c6f+VlBx2kvLyEWgbT9S0hA7mu5gCNuQzGThkXAGY=";
|
||||
npmDepsHash = "sha256-nI8xPCTZNqeGW4I99cDTxtVLicF1MEIMTPRp7O0bFE4=";
|
||||
|
||||
npmBuildScript = "compile";
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json;
|
||||
tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
|
||||
tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
|
||||
tree-sitter-nu = lib.importJSON ./tree-sitter-nu.json;
|
||||
tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
|
||||
tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json;
|
||||
tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"url": "https://github.com/LhKipp/tree-sitter-nu",
|
||||
"rev": "3133b2f391be10698c4fd6bc3d16f94cf2cb39b2",
|
||||
"date": "2023-02-18T19:56:18+01:00",
|
||||
"path": "/nix/store/x4yfa2dvs7gzi62qqs084jx38mhla0ym-tree-sitter-nu",
|
||||
"sha256": "096jz9bb0dihi1civ8x1milyhdmx5chzwyrg84wj1jv94fkfmjk0",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
|
|
@ -362,6 +362,10 @@ let
|
|||
orga = "JoranHonig";
|
||||
repo = "tree-sitter-solidity";
|
||||
};
|
||||
"tree-sitter-nu" = {
|
||||
orga = "LhKipp";
|
||||
repo = "tree-sitter-nu";
|
||||
};
|
||||
};
|
||||
|
||||
allGrammars =
|
||||
|
|
|
|||
|
|
@ -5,26 +5,25 @@
|
|||
, pkg-config
|
||||
, openssl
|
||||
# darwin dependencies
|
||||
, Security
|
||||
, CoreFoundation
|
||||
, darwin
|
||||
, libiconv
|
||||
, curl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-geiger";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-PrrhxY+Hk1XfdV0u4GgIsbo8oNOFnqbCeivY2Ix6g+k=";
|
||||
sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE=";
|
||||
};
|
||||
cargoHash = "sha256-D3upXhKFkuZfEVOPJ9mCwoZkbkX9s2MltyTkKcBvb6I=";
|
||||
cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA=";
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ];
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]);
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
# curl-sys wants to run curl-config on darwin
|
||||
++ lib.optionals stdenv.isDarwin [ curl.dev ];
|
||||
|
|
@ -37,9 +36,8 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip serialize_test2_report"
|
||||
"--skip serialize_test3_report"
|
||||
"--skip serialize_test6_report"
|
||||
"--skip test_package::case_2"
|
||||
"--skip test_package::case_3"
|
||||
"--skip test_package::case_6"
|
||||
# multiple test cases that time-out or cause memory leaks
|
||||
"--skip test_package"
|
||||
"--skip test_package_update_readme::case_2"
|
||||
"--skip test_package_update_readme::case_3"
|
||||
"--skip test_package_update_readme::case_5"
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ buildGoModule rec {
|
|||
owner = "juanfont";
|
||||
repo = "headscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
|
||||
hash = "sha256-6T4wWuhikanoQGGjVvNJak5yvgcEfhGtOmfLc2xKmms=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
|
||||
vendorHash = "sha256-+JxS4Q6rTpdBwms2nkVDY/Kluv2qu2T0BaOIjfeX85M=";
|
||||
|
||||
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jellyfin";
|
||||
version = "10.8.9"; # ensure that jellyfin-web has matching version
|
||||
version = "10.8.10"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
rev = "v${version}";
|
||||
sha256 = "kvtC9qtVuewR9W6sq963/tNgZbWSpygpBqcXnHuvX0Q=";
|
||||
sha256 = "uX56TSyi0V0Rs6R3A8QHZrjTIHUZobLYIgG+nZDE3Hg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11817,8 +11817,8 @@ let
|
|||
args = {
|
||||
name = "jellyfin-web";
|
||||
packageName = "jellyfin-web";
|
||||
version = "10.8.9";
|
||||
src = ../../../../../../../nix/store/yvn7h8hrydjxiw23fhqj5ya6yilj0d57-source;
|
||||
version = "10.8.10";
|
||||
src = ../../../../../../../nix/store/l77pzlsdcdhb2lyan89wpw111nvf348l-source;
|
||||
dependencies = [
|
||||
sources."@ampproject/remapping-2.1.2"
|
||||
(sources."@apideck/better-ajv-errors-0.3.3" // {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.8.9";
|
||||
version = "10.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
rev = "v${version}";
|
||||
sha256 = "hHZ8HVf8fidd5VPs06kB3/BHBHFxoV3fVObBesqfRJo=";
|
||||
sha256 = "fJmGiHLwhgd3Ac7ggCbkMu6llob3qN87EpHpCO4K29I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildGoModule rec {
|
|||
owner = "quay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yh617C99WSi//3YBIim5QLJTh8KgVcMkgG6AqRJYVvA=";
|
||||
hash = "sha256-Nd73GQJUYkFMyvMLAUgu/LQuDEW74s9+YKwqnftPoPM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V9Y+dZv3RKiyzGJB1o4+M4QQeRpBkCtJOr2zyjTCKTY=";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, gitUpdater
|
||||
, testers
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -20,37 +20,25 @@
|
|||
|
||||
assert withGUI -> qtbase != null && wrapQtAppsHook != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alice-tools";
|
||||
version = "0.12.1";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nunuhara";
|
||||
repo = "alice-tools";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-uXiNNneAOTDupgc+ZvaeRNbEQFJBv4ppdEc3kZeUsg8=";
|
||||
hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# These two patches (one to alice-tools, one to a subproject) improve DCF & PCF parsing
|
||||
# Remove them when version > 0.12.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nunuhara/alice-tools/commit/c800e85b37998d7a47060f5da4b1782d7201a042.patch";
|
||||
excludes = [ "subprojects/libsys4" ];
|
||||
hash = "sha256-R5ckFHqUWHdAPkFa53UbVeLgxJg/8qGLTQWwj5YRJc4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nunuhara/libsys4/commit/cff2b826d1618fb17616cdd288ab0c50f35e8032.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "subprojects/libsys4/";
|
||||
hash = "sha256-CmetiVP2kGL+MwuE9OoEDrDFxzwWvv1TtZuq1li1uIw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") ''
|
||||
# Use Meson's Qt6 module
|
||||
substituteInPlace src/meson.build \
|
||||
--replace qt5 qt6
|
||||
|
||||
# For some reason Meson uses QMake instead of pkg-config detection method for Qt6 on Darwin, which gives wrong search paths for tools
|
||||
export PATH=${qtbase.dev}/libexec:$PATH
|
||||
'';
|
||||
|
||||
mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [
|
||||
|
|
@ -93,7 +81,13 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru = {
|
||||
updateScript = gitUpdater { };
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = lib.optionalString withGUI "env QT_QPA_PLATFORM=minimal " + "${lib.getExe finalAttrs.finalPackage} --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for extracting/editing files from AliceSoft games";
|
||||
|
|
@ -103,4 +97,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
mainProgram = if withGUI then "galice" else "alice";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "2.0.11";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/LkQnS3NMvZf0yP6X32sayXvUDd0et5VkCWvJe4GboI=";
|
||||
sha256 = "sha256-l0kl+4ISrfT9rQlvCs3GSJfQAqGwxhYmcqn3USl9Ewo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.36.0";
|
||||
vendorHash = "sha256-oAekCcPoaruEq7oENhrpRj2K5l+y2/b6IzqtpQSAzk8=";
|
||||
version = "2.36.1";
|
||||
vendorHash = "sha256-i0iZhYcVRxkcCWd9+liX5vvwXCyem3v1sRZYqmsNbgY=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dyhJuKIUgWalpyM2DASjPsj3tpV9W3Z7AeMlHtWoQrk=";
|
||||
sha256 = "sha256-C3XoBtJyTQQDC5QKmNAyvdYt4ZyBhHs33bW4DDlv9lU=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
29
pkgs/tools/networking/phantomsocks/default.nix
Normal file
29
pkgs/tools/networking/phantomsocks/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "phantomsocks";
|
||||
version = "unstable-2023-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "macronut";
|
||||
repo = pname;
|
||||
rev = "a54ae9f3611e8623f89e69273f2ded7f7c0a7abf";
|
||||
hash = "sha256-ytTLwKlwbaiSWDRZBkOV7Hrl5ywWzLbv/fJ7nVlD++E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c0NQfZuMMWz1ASwFBcpMNjxZwXLo++gMYBiNgvT8ZLQ=";
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/macronut/phantomsocks";
|
||||
description = "A cross-platform proxy client/server for Linux/Windows/macOS";
|
||||
longDescription = ''
|
||||
A cross-platform proxy tool that could be used to modify TCP packets
|
||||
to implement TCB desync to bypass detection and censoring.
|
||||
'';
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11979,6 +11979,8 @@ with pkgs;
|
|||
|
||||
sasview = libsForQt5.callPackage ../applications/science/misc/sasview { };
|
||||
|
||||
schemes = callPackage ../applications/misc/schemes { };
|
||||
|
||||
scanbd = callPackage ../tools/graphics/scanbd { };
|
||||
|
||||
scdl = callPackage ../tools/misc/scdl { };
|
||||
|
|
@ -16133,9 +16135,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
|
||||
cargo-geiger = callPackage ../development/tools/rust/cargo-geiger {
|
||||
inherit (darwin.apple_sdk.frameworks) Security CoreFoundation;
|
||||
};
|
||||
cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { };
|
||||
|
||||
cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
|
|
@ -31611,6 +31611,8 @@ with pkgs;
|
|||
|
||||
kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
|
||||
|
||||
kubexit = callPackage ../applications/networking/cluster/kubexit { } ;
|
||||
|
||||
kup = libsForQt5.callPackage ../applications/misc/kup { };
|
||||
|
||||
kupfer = callPackage ../applications/misc/kupfer { };
|
||||
|
|
@ -32955,6 +32957,8 @@ with pkgs;
|
|||
|
||||
pfsshell = callPackage ../tools/misc/pfsshell { };
|
||||
|
||||
phantomsocks = callPackage ../tools/networking/phantomsocks { };
|
||||
|
||||
photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
|
||||
|
||||
photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
|
||||
|
|
@ -33182,6 +33186,8 @@ with pkgs;
|
|||
|
||||
pwdsafety = callPackage ../tools/security/pwdsafety { };
|
||||
|
||||
pyrosimple = python3Packages.callPackage ../applications/networking/p2p/pyrosimple { };
|
||||
|
||||
qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
|
||||
qbittorrent-nox = qbittorrent.override {
|
||||
guiSupport = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue